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

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

  1. bug1204045
  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: 669
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1204045
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 184 lines (+0/-97)
8 files modified
test/t/ib_incremental_bitmap.sh (+0/-12)
test/t/ib_incremental_force_full_scan.sh (+0/-13)
test/t/xb_incremental_bitmap_misc.sh (+0/-12)
test/t/xb_incremental_compressed_bitmap_16kb.sh (+0/-12)
test/t/xb_incremental_compressed_bitmap_1kb.sh (+0/-12)
test/t/xb_incremental_compressed_bitmap_2kb.sh (+0/-12)
test/t/xb_incremental_compressed_bitmap_4kb.sh (+0/-12)
test/t/xb_incremental_compressed_bitmap_8kb.sh (+0/-12)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1204045
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+181195@code.launchpad.net
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
1=== modified file 'test/t/ib_incremental_bitmap.sh'
2--- test/t/ib_incremental_bitmap.sh 2013-07-25 15:04:49 +0000
3+++ test/t/ib_incremental_bitmap.sh 2013-08-21 05:00:48 +0000
4@@ -2,18 +2,6 @@
5
6 require_xtradb
7
8-# The test is disabled for Percona XtraDB Cluster until a version
9-# with bitmap user requests is released (containing PS 5.5.29-30.0
10-# or later)
11-set +e
12-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
13-probe_result=$?
14-if [[ "$probe_result" == "0" ]]
15- then
16- skip_test "Incompatible test"
17-fi
18-set -e
19-
20 MYSQLD_EXTRA_MY_CNF_OPTS="
21 innodb-track-changed-pages=TRUE
22 "
23
24=== modified file 'test/t/ib_incremental_force_full_scan.sh'
25--- test/t/ib_incremental_force_full_scan.sh 2013-07-25 15:04:49 +0000
26+++ test/t/ib_incremental_force_full_scan.sh 2013-08-21 05:00:48 +0000
27@@ -2,19 +2,6 @@
28
29 require_xtradb
30
31-# The test is disabled for Percona XtraDB Cluster until a version
32-# with bitmap user requests is released (containing PS 5.5.29-30.0
33-# or later)
34-set +e
35-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
36-probe_result=$?
37-if [[ "$probe_result" == "0" ]]
38- then
39- skip_test "Incompatible test"
40-fi
41-set -e
42-
43-
44 MYSQLD_EXTRA_MY_CNF_OPTS="
45 innodb-track-changed-pages=TRUE
46 "
47
48=== modified file 'test/t/xb_incremental_bitmap_misc.sh'
49--- test/t/xb_incremental_bitmap_misc.sh 2013-07-25 15:04:49 +0000
50+++ test/t/xb_incremental_bitmap_misc.sh 2013-08-21 05:00:48 +0000
51@@ -2,18 +2,6 @@
52
53 require_xtradb
54
55-# The test is disabled for Percona XtraDB Cluster until a version
56-# with bitmap user requests is released (containing PS 5.5.29-30.0
57-# or later)
58-set +e
59-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
60-probe_result=$?
61-if [[ "$probe_result" == "0" ]]
62- then
63- skip_test "Incompatible test"
64-fi
65-set -e
66-
67 . inc/common.sh
68
69 MYSQLD_EXTRA_MY_CNF_OPTS="
70
71=== modified file 'test/t/xb_incremental_compressed_bitmap_16kb.sh'
72--- test/t/xb_incremental_compressed_bitmap_16kb.sh 2013-07-25 15:04:49 +0000
73+++ test/t/xb_incremental_compressed_bitmap_16kb.sh 2013-08-21 05:00:48 +0000
74@@ -2,18 +2,6 @@
75
76 require_xtradb
77
78-# The test is disabled for Percona XtraDB Cluster until a version
79-# with bitmap user requests is released (containing PS 5.5.29-30.0
80-# or later)
81-set +e
82-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
83-probe_result=$?
84-if [[ "$probe_result" == "0" ]]
85- then
86- skip_test "Incompatible test"
87-fi
88-set -e
89-
90 MYSQLD_EXTRA_MY_CNF_OPTS="
91 innodb-track-changed-pages=TRUE
92 "
93
94=== modified file 'test/t/xb_incremental_compressed_bitmap_1kb.sh'
95--- test/t/xb_incremental_compressed_bitmap_1kb.sh 2013-07-25 15:04:49 +0000
96+++ test/t/xb_incremental_compressed_bitmap_1kb.sh 2013-08-21 05:00:48 +0000
97@@ -2,18 +2,6 @@
98
99 require_xtradb
100
101-# The test is disabled for Percona XtraDB Cluster until a version
102-# with bitmap user requests is released (containing PS 5.5.29-30.0
103-# or later)
104-set +e
105-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
106-probe_result=$?
107-if [[ "$probe_result" == "0" ]]
108- then
109- skip_test "Incompatible test"
110-fi
111-set -e
112-
113 MYSQLD_EXTRA_MY_CNF_OPTS="
114 innodb-track-changed-pages=TRUE
115 "
116
117=== modified file 'test/t/xb_incremental_compressed_bitmap_2kb.sh'
118--- test/t/xb_incremental_compressed_bitmap_2kb.sh 2013-07-25 15:04:49 +0000
119+++ test/t/xb_incremental_compressed_bitmap_2kb.sh 2013-08-21 05:00:48 +0000
120@@ -2,18 +2,6 @@
121
122 require_xtradb
123
124-# The test is disabled for Percona XtraDB Cluster until a version
125-# with bitmap user requests is released (containing PS 5.5.29-30.0
126-# or later)
127-set +e
128-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
129-probe_result=$?
130-if [[ "$probe_result" == "0" ]]
131- then
132- skip_test "Incompatible test"
133-fi
134-set -e
135-
136 MYSQLD_EXTRA_MY_CNF_OPTS="
137 innodb-track-changed-pages=TRUE
138 "
139
140=== modified file 'test/t/xb_incremental_compressed_bitmap_4kb.sh'
141--- test/t/xb_incremental_compressed_bitmap_4kb.sh 2013-07-25 15:04:49 +0000
142+++ test/t/xb_incremental_compressed_bitmap_4kb.sh 2013-08-21 05:00:48 +0000
143@@ -2,18 +2,6 @@
144
145 require_xtradb
146
147-# The test is disabled for Percona XtraDB Cluster until a version
148-# with bitmap user requests is released (containing PS 5.5.29-30.0
149-# or later)
150-set +e
151-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
152-probe_result=$?
153-if [[ "$probe_result" == "0" ]]
154- then
155- skip_test "Incompatible test"
156-fi
157-set -e
158-
159 MYSQLD_EXTRA_MY_CNF_OPTS="
160 innodb-track-changed-pages=TRUE
161 "
162
163=== modified file 'test/t/xb_incremental_compressed_bitmap_8kb.sh'
164--- test/t/xb_incremental_compressed_bitmap_8kb.sh 2013-07-25 15:04:49 +0000
165+++ test/t/xb_incremental_compressed_bitmap_8kb.sh 2013-08-21 05:00:48 +0000
166@@ -2,18 +2,6 @@
167
168 require_xtradb
169
170-# The test is disabled for Percona XtraDB Cluster until a version
171-# with bitmap user requests is released (containing PS 5.5.29-30.0
172-# or later)
173-set +e
174-${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
175-probe_result=$?
176-if [[ "$probe_result" == "0" ]]
177- then
178- skip_test "Incompatible test"
179-fi
180-set -e
181-
182 MYSQLD_EXTRA_MY_CNF_OPTS="
183 innodb-track-changed-pages=TRUE
184 "

Subscribers

People subscribed via source and target branches

to all changes: