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
1=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
2--- storage/innobase/xtrabackup/src/xtrabackup.cc 2014-09-09 17:09:09 +0000
3+++ storage/innobase/xtrabackup/src/xtrabackup.cc 2014-09-10 08:50:25 +0000
4@@ -6047,6 +6047,12 @@
5 if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))
6 exit(ho_error);
7
8+ if (argc != 0) {
9+ msg("xtrabackup: Error: unknown argument: '%s'\n",
10+ argv[0]);
11+ exit(EXIT_FAILURE);
12+ }
13+
14 if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
15 if (!xtrabackup_print_param)
16 usage();
17
18=== modified file 'storage/innobase/xtrabackup/test/inc/common.sh'
19--- storage/innobase/xtrabackup/test/inc/common.sh 2014-09-04 16:53:33 +0000
20+++ storage/innobase/xtrabackup/test/inc/common.sh 2014-09-10 08:50:25 +0000
21@@ -777,5 +777,13 @@
22 2> /dev/null | egrep -q "Value: YES$"
23 }
24
25+########################################################################
26+# Return 0 if the platform is 64-bit
27+########################################################################
28+function is_64bit()
29+{
30+ uname -m 2>&1 | grep 'x86_64'
31+}
32+
33 # To avoid unbound variable error when no server have been started
34 SRV_MYSQLD_IDS=
35
36=== added file 'storage/innobase/xtrabackup/test/t/bug1367377.sh'
37--- storage/innobase/xtrabackup/test/t/bug1367377.sh 1970-01-01 00:00:00 +0000
38+++ storage/innobase/xtrabackup/test/t/bug1367377.sh 2014-09-10 08:50:25 +0000
39@@ -0,0 +1,13 @@
40+################################################################################
41+# Bug #1367377: xtrabackup should reject unknown arguments which are not options
42+################################################################################
43+
44+start_server
45+
46+run_cmd_expect_failure $XB_BIN $XB_ARGS --backup foo
47+
48+test -d xtrabackup_backupfiles && die "Default backup directory found" || true
49+
50+run_cmd_expect_failure $XB_BIN $XB_ARGS foo --backup
51+
52+test -d xtrabackup_backupfiles && die "Default backup directory found" || true
53
54=== modified file 'storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh'
55--- storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh 2013-08-20 17:51:19 +0000
56+++ storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh 2014-09-10 08:50:25 +0000
57@@ -1,6 +1,7 @@
58 # Test for incremental backups that use changed page bitmaps
59
60 require_xtradb
61+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
62
63 MYSQLD_EXTRA_MY_CNF_OPTS="
64 innodb-track-changed-pages=TRUE
65
66=== modified file 'storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh'
67--- storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh 2013-08-20 17:51:19 +0000
68+++ storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh 2014-09-10 08:50:25 +0000
69@@ -1,6 +1,7 @@
70 # Test for incremental backups that use forced full scan even when bitmaps are present
71
72 require_xtradb
73+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
74
75 MYSQLD_EXTRA_MY_CNF_OPTS="
76 innodb-track-changed-pages=TRUE
77
78=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh'
79--- storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh 2013-08-20 17:51:19 +0000
80+++ storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh 2014-09-10 08:50:25 +0000
81@@ -1,6 +1,7 @@
82 # Test diagnostics for missing bitmap data and --incremental-force-scan option
83
84 require_xtradb
85+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
86
87 . inc/common.sh
88
89
90=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh'
91--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh 2013-08-20 17:51:19 +0000
92+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh 2014-09-10 08:50:25 +0000
93@@ -1,6 +1,7 @@
94 # Test incremental backups that use bitmaps with 16KB compressed pages
95
96 require_xtradb
97+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
98
99 MYSQLD_EXTRA_MY_CNF_OPTS="
100 innodb-track-changed-pages=TRUE
101
102=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh'
103--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh 2013-08-20 17:51:19 +0000
104+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh 2014-09-10 08:50:25 +0000
105@@ -1,6 +1,7 @@
106 # Test incremental backups that use bitmaps with 1KB compressed pages
107
108 require_xtradb
109+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
110
111 MYSQLD_EXTRA_MY_CNF_OPTS="
112 innodb-track-changed-pages=TRUE
113
114=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh'
115--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh 2013-08-20 17:51:19 +0000
116+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh 2014-09-10 08:50:25 +0000
117@@ -1,6 +1,7 @@
118 # Test incremental backups that use bitmaps with 2KB compressed pages
119
120 require_xtradb
121+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
122
123 MYSQLD_EXTRA_MY_CNF_OPTS="
124 innodb-track-changed-pages=TRUE
125
126=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh'
127--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh 2013-08-20 17:51:19 +0000
128+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh 2014-09-10 08:50:25 +0000
129@@ -1,6 +1,7 @@
130 # Test incremental backups that use bitmaps with 4KB compressed pages
131
132 require_xtradb
133+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
134
135 MYSQLD_EXTRA_MY_CNF_OPTS="
136 innodb-track-changed-pages=TRUE
137
138=== modified file 'storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh'
139--- storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh 2013-08-20 17:51:19 +0000
140+++ storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh 2014-09-10 08:50:25 +0000
141@@ -1,6 +1,7 @@
142 # Test incremental backups that use bitmaps with 8KB compressed pages
143
144 require_xtradb
145+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
146
147 MYSQLD_EXTRA_MY_CNF_OPTS="
148 innodb-track-changed-pages=TRUE

Subscribers

People subscribed via source and target branches

to all changes: