Merge lp:~akopytov/percona-xtrabackup/bug1367613-2.2 into lp:percona-xtrabackup/2.2

Proposed by Alexey Kopytov on 2014-09-10
Status: Merged
Approved by: Alexey Kopytov on 2014-09-10
Approved revision: 5006
Merged at revision: 5006
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1367613-2.2
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 148 lines (+35/-0)
11 files modified
storage/innobase/xtrabackup/src/xtrabackup.cc (+6/-0)
storage/innobase/xtrabackup/test/inc/common.sh (+8/-0)
storage/innobase/xtrabackup/test/t/bug1367377.sh (+13/-0)
storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh (+1/-0)
storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh (+1/-0)
storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh (+1/-0)
storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh (+1/-0)
storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh (+1/-0)
storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh (+1/-0)
storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh (+1/-0)
storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh (+1/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1367613-2.2
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve on 2014-09-10
Review via email: mp+234068@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc 2014-09-09 17:09:09 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc 2014-09-10 08:50:25 +0000
@@ -6047,6 +6047,12 @@
6047 if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))6047 if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))
6048 exit(ho_error);6048 exit(ho_error);
60496049
6050 if (argc != 0) {
6051 msg("xtrabackup: Error: unknown argument: '%s'\n",
6052 argv[0]);
6053 exit(EXIT_FAILURE);
6054 }
6055
6050 if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {6056 if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
6051 if (!xtrabackup_print_param)6057 if (!xtrabackup_print_param)
6052 usage();6058 usage();
60536059
=== modified file 'storage/innobase/xtrabackup/test/inc/common.sh'
--- storage/innobase/xtrabackup/test/inc/common.sh 2014-09-04 16:53:33 +0000
+++ storage/innobase/xtrabackup/test/inc/common.sh 2014-09-10 08:50:25 +0000
@@ -777,5 +777,13 @@
777 2> /dev/null | egrep -q "Value: YES$"777 2> /dev/null | egrep -q "Value: YES$"
778}778}
779779
780########################################################################
781# Return 0 if the platform is 64-bit
782########################################################################
783function is_64bit()
784{
785 uname -m 2>&1 | grep 'x86_64'
786}
787
780# To avoid unbound variable error when no server have been started788# To avoid unbound variable error when no server have been started
781SRV_MYSQLD_IDS=789SRV_MYSQLD_IDS=
782790
=== added file 'storage/innobase/xtrabackup/test/t/bug1367377.sh'
--- storage/innobase/xtrabackup/test/t/bug1367377.sh 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1367377.sh 2014-09-10 08:50:25 +0000
@@ -0,0 +1,13 @@
1################################################################################
2# Bug #1367377: xtrabackup should reject unknown arguments which are not options
3################################################################################
4
5start_server
6
7run_cmd_expect_failure $XB_BIN $XB_ARGS --backup foo
8
9test -d xtrabackup_backupfiles && die "Default backup directory found" || true
10
11run_cmd_expect_failure $XB_BIN $XB_ARGS foo --backup
12
13test -d xtrabackup_backupfiles && die "Default backup directory found" || true
014
=== modified file 'storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh'
--- storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test for incremental backups that use changed page bitmaps1# Test for incremental backups that use changed page bitmaps
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5MYSQLD_EXTRA_MY_CNF_OPTS="6MYSQLD_EXTRA_MY_CNF_OPTS="
6innodb-track-changed-pages=TRUE7innodb-track-changed-pages=TRUE
78
=== modified file 'storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh'
--- storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test for incremental backups that use forced full scan even when bitmaps are present1# Test for incremental backups that use forced full scan even when bitmaps are present
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5MYSQLD_EXTRA_MY_CNF_OPTS="6MYSQLD_EXTRA_MY_CNF_OPTS="
6innodb-track-changed-pages=TRUE7innodb-track-changed-pages=TRUE
78
=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh'
--- storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test diagnostics for missing bitmap data and --incremental-force-scan option1# Test diagnostics for missing bitmap data and --incremental-force-scan option
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5. inc/common.sh6. inc/common.sh
67
78
=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh'
--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test incremental backups that use bitmaps with 16KB compressed pages1# Test incremental backups that use bitmaps with 16KB compressed pages
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5MYSQLD_EXTRA_MY_CNF_OPTS="6MYSQLD_EXTRA_MY_CNF_OPTS="
6innodb-track-changed-pages=TRUE7innodb-track-changed-pages=TRUE
78
=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh'
--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test incremental backups that use bitmaps with 1KB compressed pages1# Test incremental backups that use bitmaps with 1KB compressed pages
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5MYSQLD_EXTRA_MY_CNF_OPTS="6MYSQLD_EXTRA_MY_CNF_OPTS="
6innodb-track-changed-pages=TRUE7innodb-track-changed-pages=TRUE
78
=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh'
--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test incremental backups that use bitmaps with 2KB compressed pages1# Test incremental backups that use bitmaps with 2KB compressed pages
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5MYSQLD_EXTRA_MY_CNF_OPTS="6MYSQLD_EXTRA_MY_CNF_OPTS="
6innodb-track-changed-pages=TRUE7innodb-track-changed-pages=TRUE
78
=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh'
--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test incremental backups that use bitmaps with 4KB compressed pages1# Test incremental backups that use bitmaps with 4KB compressed pages
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5MYSQLD_EXTRA_MY_CNF_OPTS="6MYSQLD_EXTRA_MY_CNF_OPTS="
6innodb-track-changed-pages=TRUE7innodb-track-changed-pages=TRUE
78
=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh'
--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh 2013-08-20 17:51:19 +0000
+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh 2014-09-10 08:50:25 +0000
@@ -1,6 +1,7 @@
1# Test incremental backups that use bitmaps with 8KB compressed pages1# Test incremental backups that use bitmaps with 8KB compressed pages
22
3require_xtradb3require_xtradb
4is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
45
5MYSQLD_EXTRA_MY_CNF_OPTS="6MYSQLD_EXTRA_MY_CNF_OPTS="
6innodb-track-changed-pages=TRUE7innodb-track-changed-pages=TRUE

Subscribers

People subscribed via source and target branches

to all changes: