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

Proposed by Alexey Kopytov on 2012-06-21
Status: Merged
Approved by: Laurynas Biveinis on 2012-06-21
Approved revision: 408
Merged at revision: 409
Proposed branch: lp:~akopytov/percona-xtrabackup/bug996483-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 64 lines (+19/-3)
4 files modified
test/inc/common.sh (+16/-0)
test/t/bug606981.sh (+1/-1)
test/t/bug759225.sh (+1/-1)
test/t/xb_stats.sh (+1/-1)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug996483-2.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2012-06-21 Approve on 2012-06-21
Review via email: mp+111339@code.launchpad.net

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 2012-06-12 10:38:27 +0000
3+++ test/inc/common.sh 2012-06-21 06:08:32 +0000
4@@ -386,5 +386,21 @@
5 diff -u "$topdir/tmp/$1_old.sql" "$topdir/tmp/$1_new.sql"
6 }
7
8+########################################################################
9+# Workarounds for a bug in grep 2.10 when grep -q file > file would
10+# result in a failure.
11+########################################################################
12+function grep()
13+{
14+ command grep "$@" | cat
15+ return ${PIPESTATUS[0]}
16+}
17+
18+function egrep()
19+{
20+ command egrep "$@" | cat
21+ return ${PIPESTATUS[0]}
22+}
23+
24 # To avoid unbound variable error when no server have been started
25 SRV_MYSQLD_IDS=
26
27=== modified file 'test/t/bug606981.sh'
28--- test/t/bug606981.sh 2012-06-05 12:35:33 +0000
29+++ test/t/bug606981.sh 2012-06-21 06:08:32 +0000
30@@ -17,7 +17,7 @@
31 stop_server
32
33 # See if xtrabackup was using O_DIRECT
34-if ! grep "xtrabackup: using O_DIRECT" $OUTFILE ;
35+if ! grep -q "xtrabackup: using O_DIRECT" $OUTFILE ;
36 then
37 vlog "xtrabackup was not using O_DIRECT for the input file."
38 exit -1
39
40=== modified file 'test/t/bug759225.sh'
41--- test/t/bug759225.sh 2012-06-05 12:35:33 +0000
42+++ test/t/bug759225.sh 2012-06-21 06:08:32 +0000
43@@ -26,7 +26,7 @@
44 stop_server
45
46 # See if xtrabackup was using ALL_O_DIRECT
47-if ! grep "xtrabackup: using ALL_O_DIRECT" $OUTFILE ;
48+if ! grep -q "xtrabackup: using ALL_O_DIRECT" $OUTFILE ;
49 then
50 vlog "xtrabackup was not using ALL_O_DIRECT for the input file."
51 exit -1
52
53=== modified file 'test/t/xb_stats.sh'
54--- test/t/xb_stats.sh 2012-06-05 12:35:33 +0000
55+++ test/t/xb_stats.sh 2012-06-21 06:08:32 +0000
56@@ -17,7 +17,7 @@
57 vlog "===> xtrabackup --stats --datadir=$topdir/backup"
58 run_cmd_expect_failure $XB_BIN $XB_ARGS --stats --datadir=$topdir/backup
59
60-if ! grep "Cannot find log file ib_logfile0" $OUTFILE
61+if ! grep -q "Cannot find log file ib_logfile0" $OUTFILE
62 then
63 die "Cannot find the expected error message from xtrabackup --stats"
64 fi

Subscribers

People subscribed via source and target branches

to all changes: