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

Proposed by Alexey Kopytov
Status: Merged
Approved by: Stewart Smith
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 Pending
Review via email: mp+86495@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Preview Diff

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

Subscribers

People subscribed via source and target branches