Merge lp:~gl-az/percona-server/bug1396330-5.6 into lp:percona-server/5.6

Proposed by George Ormond Lorch III
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 700
Merged at revision: 700
Proposed branch: lp:~gl-az/percona-server/bug1396330-5.6
Merge into: lp:percona-server/5.6
Diff against target: 12 lines (+1/-1)
1 file modified
mysql-test/include/mysqlhotcopy.inc (+1/-1)
To merge this branch: bzr merge lp:~gl-az/percona-server/bug1396330-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Registry Administrators g2 Pending
Review via email: mp+242845@code.launchpad.net

Description of the change

Simple fix for bug 1396330 - mtr failure on Ubuntu Utopic, mysqlhotcopy fails with wrong error(255)
Added possible return code of 255 to mtr --error list.

To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) wrote :
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/include/mysqlhotcopy.inc'
2--- mysql-test/include/mysqlhotcopy.inc 2011-05-31 13:52:09 +0000
3+++ mysql-test/include/mysqlhotcopy.inc 2014-11-25 21:10:36 +0000
4@@ -107,7 +107,7 @@
5 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
6 --list_files $MYSQLD_DATADIR/hotcopy_save
7 --replace_result $MASTER_MYSOCK MASTER_MYSOCK
8---error 9,11,110,2304
9+--error 9,11,110,255,2304
10 --exec $MYSQLHOTCOPY --quiet -S $MASTER_MYSOCK -u root hotcopy_test hotcopy_save
11 --replace_result $MASTER_MYSOCK MASTER_MYSOCK
12 --exec $MYSQLHOTCOPY --quiet --allowold -S $MASTER_MYSOCK -u root hotcopy_test hotcopy_save

Subscribers

People subscribed via source and target branches