Percona XtraBackup moved to https://jira.percona.com/projects/PXB

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

  1. bug1367613-2.1
  2. Merge into 2.1
Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 763
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1367613-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 148 lines (+35/-0)
11 files modified
src/xtrabackup.cc (+6/-0)
test/inc/common.sh (+8/-0)
test/t/bug1367377.sh (+13/-0)
test/t/ib_incremental_bitmap.sh (+1/-0)
test/t/ib_incremental_force_full_scan.sh (+1/-0)
test/t/xb_incremental_bitmap_misc.sh (+1/-0)
test/t/xb_incremental_compressed_bitmap_16kb.sh (+1/-0)
test/t/xb_incremental_compressed_bitmap_1kb.sh (+1/-0)
test/t/xb_incremental_compressed_bitmap_2kb.sh (+1/-0)
test/t/xb_incremental_compressed_bitmap_4kb.sh (+1/-0)
test/t/xb_incremental_compressed_bitmap_8kb.sh (+1/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1367613-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+234067@code.launchpad.net

Description of the change

    Bug #1367613: Temporarily disable innodb-track-changed-pages tests on
                  32-bit hosts

    Skip tests involving innodb-track-changed-pages on 32-bit hosts.

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param-new/14/

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc 2014-09-09 15:34:22 +0000
+++ src/xtrabackup.cc 2014-09-10 08:49:57 +0000
@@ -5921,6 +5921,12 @@
5921 if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))5921 if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))
5922 exit(ho_error);5922 exit(ho_error);
59235923
5924 if (argc != 0) {
5925 msg("xtrabackup: Error: unknown argument: '%s'\n",
5926 argv[0]);
5927 exit(EXIT_FAILURE);
5928 }
5929
5924 if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {5930 if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
5925 if (!xtrabackup_print_param)5931 if (!xtrabackup_print_param)
5926 usage();5932 usage();
59275933
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh 2013-11-13 08:33:06 +0000
+++ test/inc/common.sh 2014-09-10 08:49:57 +0000
@@ -767,5 +767,13 @@
767 vlog "Done."767 vlog "Done."
768}768}
769769
770########################################################################
771# Return 0 if the platform is 64-bit
772########################################################################
773function is_64bit()
774{
775 uname -m 2>&1 | grep 'x86_64'
776}
777
770# To avoid unbound variable error when no server have been started778# To avoid unbound variable error when no server have been started
771SRV_MYSQLD_IDS=779SRV_MYSQLD_IDS=
772780
=== added file 'test/t/bug1367377.sh'
--- test/t/bug1367377.sh 1970-01-01 00:00:00 +0000
+++ test/t/bug1367377.sh 2014-09-10 08:49:57 +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 'test/t/ib_incremental_bitmap.sh'
--- test/t/ib_incremental_bitmap.sh 2013-08-20 17:51:19 +0000
+++ test/t/ib_incremental_bitmap.sh 2014-09-10 08:49:57 +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 'test/t/ib_incremental_force_full_scan.sh'
--- test/t/ib_incremental_force_full_scan.sh 2013-08-20 17:51:19 +0000
+++ test/t/ib_incremental_force_full_scan.sh 2014-09-10 08:49:57 +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 'test/t/xb_incremental_bitmap_misc.sh'
--- test/t/xb_incremental_bitmap_misc.sh 2013-08-20 17:51:19 +0000
+++ test/t/xb_incremental_bitmap_misc.sh 2014-09-10 08:49:57 +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 'test/t/xb_incremental_compressed_bitmap_16kb.sh'
--- test/t/xb_incremental_compressed_bitmap_16kb.sh 2013-08-20 17:51:19 +0000
+++ test/t/xb_incremental_compressed_bitmap_16kb.sh 2014-09-10 08:49:57 +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 'test/t/xb_incremental_compressed_bitmap_1kb.sh'
--- test/t/xb_incremental_compressed_bitmap_1kb.sh 2013-08-20 17:51:19 +0000
+++ test/t/xb_incremental_compressed_bitmap_1kb.sh 2014-09-10 08:49:57 +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 'test/t/xb_incremental_compressed_bitmap_2kb.sh'
--- test/t/xb_incremental_compressed_bitmap_2kb.sh 2013-08-20 17:51:19 +0000
+++ test/t/xb_incremental_compressed_bitmap_2kb.sh 2014-09-10 08:49:57 +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 'test/t/xb_incremental_compressed_bitmap_4kb.sh'
--- test/t/xb_incremental_compressed_bitmap_4kb.sh 2013-08-20 17:51:19 +0000
+++ test/t/xb_incremental_compressed_bitmap_4kb.sh 2014-09-10 08:49:57 +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 'test/t/xb_incremental_compressed_bitmap_8kb.sh'
--- test/t/xb_incremental_compressed_bitmap_8kb.sh 2013-08-20 17:51:19 +0000
+++ test/t/xb_incremental_compressed_bitmap_8kb.sh 2014-09-10 08:49:57 +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: