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

Proposed by Alexey Kopytov on 2013-08-28
Status: Merged
Approved by: Alexey Kopytov on 2013-08-28
Approved revision: 585
Merged at revision: 585
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1214272-2.0-revert
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 66 lines (+0/-24)
4 files modified
test/inc/common.sh (+0/-9)
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.0-revert
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve on 2013-08-28
Review via email: mp+182683@code.launchpad.net
To post a comment you must log in.
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/inc/common.sh'
--- test/inc/common.sh 2013-08-20 10:35:54 +0000
+++ test/inc/common.sh 2013-08-28 15:40:11 +0000
@@ -552,14 +552,5 @@
552 return ${PIPESTATUS[0]}552 return ${PIPESTATUS[0]}
553}553}
554554
555########################################################################
556# Skip the current test with a given comment
557########################################################################
558function skip_test()
559{
560 echo $1 > $SKIPPED_REASON
561 exit $SKIPPED_EXIT_CODE
562}
563
564# To avoid unbound variable error when no server have been started555# To avoid unbound variable error when no server have been started
565SRV_MYSQLD_IDS=556SRV_MYSQLD_IDS=
566557
=== modified file 'test/t/bug983720_galerainfo.sh'
--- test/t/bug983720_galerainfo.sh 2013-08-20 07:37:42 +0000
+++ test/t/bug983720_galerainfo.sh 2013-08-28 15:40:11 +0000
@@ -17,11 +17,6 @@
17fi17fi
18set -e18set -e
1919
20if ! uname -m | grep -q x86_64
21then
22 skip_test "Skipped on 32-bit machines due to bug #1204241."
23fi
24
25debug=""20debug=""
26pdebug=""21pdebug=""
27if [[ -n ${WSREP_DEBUG:-} ]];then 22if [[ -n ${WSREP_DEBUG:-} ]];then
2823
=== modified file 'test/t/xb_galera_info.sh'
--- test/t/xb_galera_info.sh 2013-08-20 07:37:42 +0000
+++ test/t/xb_galera_info.sh 2013-08-28 15:40:11 +0000
@@ -13,11 +13,6 @@
13fi13fi
14set -e14set -e
1515
16if ! uname -m | grep -q x86_64
17then
18 skip_test "Skipped on 32-bit machines due to bug #1204241."
19fi
20
21if [[ -n ${WSREP_DEBUG:-} ]];then 16if [[ -n ${WSREP_DEBUG:-} ]];then
22 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=$ADDR17 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
23else 18else
2419
=== modified file 'test/t/xb_galera_sst.sh'
--- test/t/xb_galera_sst.sh 2013-08-20 07:37:42 +0000
+++ test/t/xb_galera_sst.sh 2013-08-28 15:40:11 +0000
@@ -24,11 +24,6 @@
24fi24fi
25set -e25set -e
2626
27if ! uname -m | grep -q x86_64
28then
29 skip_test "Skipped on 32-bit machines due to bug #1204241."
30fi
31
32debug=""27debug=""
33pdebug=""28pdebug=""
34if [[ -n ${WSREP_DEBUG:-} ]];then 29if [[ -n ${WSREP_DEBUG:-} ]];then

Subscribers

People subscribed via source and target branches