From bc2c40e71bf3f97fb5013256ff05551b6c3daee5 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 11 Feb 2012 13:32:36 +0100 Subject: [PATCH] Fix _another_ race in test case rpl_cant_read_event_incident (seen in 5.5 Buildbot). --- .../suite/rpl/r/rpl_cant_read_event_incident.result | 2 +- mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result b/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result index 8a4de852617..bcae1c2c62b 100644 --- a/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result +++ b/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result @@ -15,5 +15,5 @@ Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary reset master; stop slave; reset slave; -drop table t; +drop table if exists t; End of the tests diff --git a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test index 9789079bde6..7d05ce251f2 100644 --- a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test +++ b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test @@ -69,6 +69,12 @@ reset master; --connection slave stop slave; reset slave; -drop table t; # table was created from binlog. it does not exist on master. +# The table t may have been created on the slave from binlog. It does not exist +# on the master. +# "May", as it depends on whether the SQL thread had time do do the CREATE +# TABLE before we stopped. +--disable_warnings +drop table if exists t; +--enable_warnings --echo End of the tests