Merge lp://qastaging/~dveeden/percona-xtrabackup/lp733665 into lp://qastaging/percona-xtrabackup/2.0
Proposed by
Daniël van Eeden
| Status: | Rejected | ||||
|---|---|---|---|---|---|
| Rejected by: | Alexey Kopytov | ||||
| Proposed branch: | lp://qastaging/~dveeden/percona-xtrabackup/lp733665 | ||||
| Merge into: | lp://qastaging/percona-xtrabackup/2.0 | ||||
| Diff against target: |
1690 lines (+1461/-16) (has conflicts) 8 files modified
Makefile (+38/-0) innobackupex (+15/-6) patches/mariadb53.patch (+1262/-0) test/bootstrap.sh (+36/-1) test/run.sh (+13/-2) test/t/ib_aria.sh (+67/-0) utils/build.sh (+27/-6) xtrabackup.c (+3/-1) Text conflict in test/bootstrap.sh |
||||
| To merge this branch: | bzr merge lp://qastaging/~dveeden/percona-xtrabackup/lp733665 | ||||
| Related bugs: |
|
||||
| Related blueprints: |
Add MariaDB support
(Undefined)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexey Kopytov | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Alexey Kopytov (akopytov) wrote | # |
Unmerged revisions
- 311. By Daniël van Eeden
-
Set sql_mode to NO_ENGINE_
SUBSTITUTION and only run the Aria test on MariaDB - 310. By Daniël van Eeden
-
Add test for backup of Aria engine
- 309. By Daniël van Eeden
-
Also backup .MAD and .MAI for the Aria engine.
- 308. By Daniël van Eeden
-
Check wget return code.
- 307. By Daniël van Eeden
-
Allow compilation against MariaDB 5.3
- 306. By Daniël van Eeden
-
Add SHA1 sum verification to bootstrap.sh
- 305. By Daniël van Eeden
-
Add MariaDB 5.3 to bootstrap.sh
- 304. By Daniël van Eeden
-
Initial support for MariaDB added to the test run.
- 303. By Daniël van Eeden
-
Initial MariaDB support
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Superseded with https:/