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
=== modified file 'test/t/bug983720_galerainfo.sh'
--- test/t/bug983720_galerainfo.sh 2013-08-20 07:38:02 +0000
+++ test/t/bug983720_galerainfo.sh 2013-08-28 15:40:44 +0000
@@ -16,11 +16,6 @@
16fi16fi
17set -e17set -e
1818
19if ! uname -m | grep -q x86_64
20then
21 skip_test "Skipped on 32-bit machines due to bug #1204241."
22fi
23
24debug=""19debug=""
25pdebug=""20pdebug=""
26if [[ -n ${WSREP_DEBUG:-} ]];then 21if [[ -n ${WSREP_DEBUG:-} ]];then
2722
=== modified file 'test/t/xb_galera_info.sh'
--- test/t/xb_galera_info.sh 2013-08-20 07:38:02 +0000
+++ test/t/xb_galera_info.sh 2013-08-28 15:40:44 +0000
@@ -12,11 +12,6 @@
12fi12fi
13set -e13set -e
1414
15if ! uname -m | grep -q x86_64
16then
17 skip_test "Skipped on 32-bit machines due to bug #1204241."
18fi
19
20if [[ -n ${WSREP_DEBUG:-} ]];then 15if [[ -n ${WSREP_DEBUG:-} ]];then
21 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=$ADDR16 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
22else 17else
2318
=== modified file 'test/t/xb_galera_sst.sh'
--- test/t/xb_galera_sst.sh 2013-08-20 07:38:02 +0000
+++ test/t/xb_galera_sst.sh 2013-08-28 15:40:44 +0000
@@ -23,11 +23,6 @@
23fi23fi
24set -e24set -e
2525
26if ! uname -m | grep -q x86_64
27then
28 skip_test "Skipped on 32-bit machines due to bug #1204241."
29fi
30
31debug=""26debug=""
32pdebug=""27pdebug=""
33if [[ -n ${WSREP_DEBUG:-} ]];then 28if [[ -n ${WSREP_DEBUG:-} ]];then

Subscribers

People subscribed via source and target branches

to all changes: