Merge lp:~akopytov/percona-xtrabackup/bug907147-1.6 into lp:percona-xtrabackup/1.6

Proposed by Alexey Kopytov on 2011-12-21
Status: Merged
Approved by: Stewart Smith on 2011-12-21
Approved revision: 313
Merged at revision: 313
Proposed branch: lp:~akopytov/percona-xtrabackup/bug907147-1.6
Merge into: lp:percona-xtrabackup/1.6
Diff against target: 31 lines (+15/-1)
2 files modified
innobackupex (+1/-1)
test/t/ib_binlog_info.sh (+14/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug907147-1.6
Reviewer Review Type Date Requested Status
Percona developers 2011-12-21 Pending
Review via email: mp+86495@code.launchpad.net

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innobackupex'
2--- innobackupex 2011-12-17 03:21:32 +0000
3+++ innobackupex 2011-12-21 06:02:26 +0000
4@@ -1165,7 +1165,7 @@
5 # get "show master status" output lines (2) from mysql output
6 file_to_array($mysql_stdout, \@lines);
7 foreach my $line (@lines) {
8- if ($line =~ m/innobackup hello/) {
9+ if ($line =~ m/xtrabackup ping/) {
10 # this is a hello message, ignore it
11 } else {
12 # this is output line from "show master status"
13
14=== added file 'test/t/ib_binlog_info.sh'
15--- test/t/ib_binlog_info.sh 1970-01-01 00:00:00 +0000
16+++ test/t/ib_binlog_info.sh 2011-12-21 06:02:26 +0000
17@@ -0,0 +1,14 @@
18+##########################################################################
19+# Bug #907147: 1.6.4-313 loses master log info #
20+##########################################################################
21+
22+. inc/common.sh
23+
24+init
25+run_mysqld
26+load_sakila
27+
28+innobackupex --no-timestamp $topdir/backup
29+
30+run_cmd_expect_failure grep "xtrabackup ping" \
31+ $topdir/backup/xtrabackup_binlog_info

Subscribers

People subscribed via source and target branches