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
1=== modified file 'test/inc/common.sh'
2--- test/inc/common.sh 2013-08-20 10:35:54 +0000
3+++ test/inc/common.sh 2013-08-28 15:40:11 +0000
4@@ -552,14 +552,5 @@
5 return ${PIPESTATUS[0]}
6 }
7
8-########################################################################
9-# Skip the current test with a given comment
10-########################################################################
11-function skip_test()
12-{
13- echo $1 > $SKIPPED_REASON
14- exit $SKIPPED_EXIT_CODE
15-}
16-
17 # To avoid unbound variable error when no server have been started
18 SRV_MYSQLD_IDS=
19
20=== modified file 'test/t/bug983720_galerainfo.sh'
21--- test/t/bug983720_galerainfo.sh 2013-08-20 07:37:42 +0000
22+++ test/t/bug983720_galerainfo.sh 2013-08-28 15:40:11 +0000
23@@ -17,11 +17,6 @@
24 fi
25 set -e
26
27-if ! uname -m | grep -q x86_64
28-then
29- skip_test "Skipped on 32-bit machines due to bug #1204241."
30-fi
31-
32 debug=""
33 pdebug=""
34 if [[ -n ${WSREP_DEBUG:-} ]];then
35
36=== modified file 'test/t/xb_galera_info.sh'
37--- test/t/xb_galera_info.sh 2013-08-20 07:37:42 +0000
38+++ test/t/xb_galera_info.sh 2013-08-28 15:40:11 +0000
39@@ -13,11 +13,6 @@
40 fi
41 set -e
42
43-if ! uname -m | grep -q x86_64
44-then
45- skip_test "Skipped on 32-bit machines due to bug #1204241."
46-fi
47-
48 if [[ -n ${WSREP_DEBUG:-} ]];then
49 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
50 else
51
52=== modified file 'test/t/xb_galera_sst.sh'
53--- test/t/xb_galera_sst.sh 2013-08-20 07:37:42 +0000
54+++ test/t/xb_galera_sst.sh 2013-08-28 15:40:11 +0000
55@@ -24,11 +24,6 @@
56 fi
57 set -e
58
59-if ! uname -m | grep -q x86_64
60-then
61- skip_test "Skipped on 32-bit machines due to bug #1204241."
62-fi
63-
64 debug=""
65 pdebug=""
66 if [[ -n ${WSREP_DEBUG:-} ]];then

Subscribers

People subscribed via source and target branches