Merge lp:~akopytov/percona-xtrabackup/bug1214272-2.1-revert into lp:percona-xtrabackup/2.1

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 672
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1214272-2.1-revert
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 47 lines (+0/-15)
3 files modified
test/t/bug983720_galerainfo.sh (+0/-5)
test/t/xb_galera_info.sh (+0/-5)
test/t/xb_galera_sst.sh (+0/-5)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1214272-2.1-revert
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+182684@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Trivial change, self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/t/bug983720_galerainfo.sh'
2--- test/t/bug983720_galerainfo.sh 2013-08-20 07:38:02 +0000
3+++ test/t/bug983720_galerainfo.sh 2013-08-28 15:40:44 +0000
4@@ -16,11 +16,6 @@
5 fi
6 set -e
7
8-if ! uname -m | grep -q x86_64
9-then
10- skip_test "Skipped on 32-bit machines due to bug #1204241."
11-fi
12-
13 debug=""
14 pdebug=""
15 if [[ -n ${WSREP_DEBUG:-} ]];then
16
17=== modified file 'test/t/xb_galera_info.sh'
18--- test/t/xb_galera_info.sh 2013-08-20 07:38:02 +0000
19+++ test/t/xb_galera_info.sh 2013-08-28 15:40:44 +0000
20@@ -12,11 +12,6 @@
21 fi
22 set -e
23
24-if ! uname -m | grep -q x86_64
25-then
26- skip_test "Skipped on 32-bit machines due to bug #1204241."
27-fi
28-
29 if [[ -n ${WSREP_DEBUG:-} ]];then
30 start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep-debug=1 --wsrep_provider_options="debug=1" --wsrep_node_address=$ADDR
31 else
32
33=== modified file 'test/t/xb_galera_sst.sh'
34--- test/t/xb_galera_sst.sh 2013-08-20 07:38:02 +0000
35+++ test/t/xb_galera_sst.sh 2013-08-28 15:40:44 +0000
36@@ -23,11 +23,6 @@
37 fi
38 set -e
39
40-if ! uname -m | grep -q x86_64
41-then
42- skip_test "Skipped on 32-bit machines due to bug #1204241."
43-fi
44-
45 debug=""
46 pdebug=""
47 if [[ -n ${WSREP_DEBUG:-} ]];then

Subscribers

People subscribed via source and target branches

to all changes: