Merge lp:~tsarev/percona-server/binlog-repeatable-fix into lp:percona-server/5.1

Proposed by Oleg Tsarev
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 272
Proposed branch: lp:~tsarev/percona-server/binlog-repeatable-fix
Merge into: lp:percona-server/5.1
Diff against target: 35 lines (+28/-0)
1 file modified
patches/mysql-test.diff (+28/-0)
To merge this branch: bzr merge lp:~tsarev/percona-server/binlog-repeatable-fix
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Laurynas Biveinis (community) Approve
Review via email: mp+70935@code.launchpad.net

Description of the change

Fixed test repeatable fails of test binlog.binlog_bug36391
DROP TABLE t1 run two times.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM

This and other similar failures look like upstream bugs, can you report them there?

review: Approve
Revision history for this message
Oleg Tsarev (tsarev) wrote :
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff 2011-08-09 13:35:34 +0000
+++ patches/mysql-test.diff 2011-08-09 17:30:23 +0000
@@ -3886,3 +3886,31 @@
3886 3886
3887 -- Dump all databases, there should be none3887 -- Dump all databases, there should be none
3888 -- except those that was created during bootstrap3888 -- except those that was created during bootstrap
3889--- a/mysql-test/suite/binlog/r/binlog_bug36391.result
3890+++ b/mysql-test/suite/binlog/r/binlog_bug36391.result
3891@@ -3,8 +3,8 @@
3892 Tables_in_test
3893 t1
3894 FLUSH LOGS;
3895-DROP TABLE t1;
3896+DROP TABLE IF EXISTS t1;
3897 SHOW TABLES;
3898 Tables_in_test
3899 t1
3900-DROP TABLE t1;
3901+DROP TABLE IF EXISTS t1;
3902--- a/mysql-test/suite/binlog/t/binlog_bug36391.test
3903+++ b/mysql-test/suite/binlog/t/binlog_bug36391.test
3904@@ -21,10 +21,10 @@
3905 let $binlog_path= `SELECT CONCAT(@@DATADIR, '$binlog')`;
3906 SHOW TABLES;
3907 FLUSH LOGS;
3908-DROP TABLE t1;
3909+DROP TABLE IF EXISTS t1;
3910
3911 --exec $MYSQL_BINLOG $binlog_path | $MYSQL test
3912 SHOW TABLES;
3913
3914 # Clean up
3915-DROP TABLE t1;
3916+DROP TABLE IF EXISTS t1;

Subscribers

People subscribed via source and target branches