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
1=== modified file 'patches/mysql-test.diff'
2--- patches/mysql-test.diff 2011-08-09 13:35:34 +0000
3+++ patches/mysql-test.diff 2011-08-09 17:30:23 +0000
4@@ -3886,3 +3886,31 @@
5
6 -- Dump all databases, there should be none
7 -- except those that was created during bootstrap
8+--- a/mysql-test/suite/binlog/r/binlog_bug36391.result
9++++ b/mysql-test/suite/binlog/r/binlog_bug36391.result
10+@@ -3,8 +3,8 @@
11+ Tables_in_test
12+ t1
13+ FLUSH LOGS;
14+-DROP TABLE t1;
15++DROP TABLE IF EXISTS t1;
16+ SHOW TABLES;
17+ Tables_in_test
18+ t1
19+-DROP TABLE t1;
20++DROP TABLE IF EXISTS t1;
21+--- a/mysql-test/suite/binlog/t/binlog_bug36391.test
22++++ b/mysql-test/suite/binlog/t/binlog_bug36391.test
23+@@ -21,10 +21,10 @@
24+ let $binlog_path= `SELECT CONCAT(@@DATADIR, '$binlog')`;
25+ SHOW TABLES;
26+ FLUSH LOGS;
27+-DROP TABLE t1;
28++DROP TABLE IF EXISTS t1;
29+
30+ --exec $MYSQL_BINLOG $binlog_path | $MYSQL test
31+ SHOW TABLES;
32+
33+ # Clean up
34+-DROP TABLE t1;
35++DROP TABLE IF EXISTS t1;

Subscribers

People subscribed via source and target branches