merging fixes of bug@45576 to 5.1-bt

3 files changed, 9 insertions, 39 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result
index 4c2b9ebeaee..8a1b7a805aa 100644
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result
@@ -241,10 +241,12 @@ STOP SLAVE;
 SET GLOBAL storage_engine=@storage_engine;
 START SLAVE;
 ================ BUG#22864 ================
-STOP SLAVE;
-RESET SLAVE;
-RESET MASTER;
-START SLAVE;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
 SET AUTOCOMMIT=0;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1),(2),(3);
@@ -264,15 +266,6 @@ t1
 t2
 t3
 t4
-SELECT   TABLE_NAME,ENGINE
-FROM   INFORMATION_SCHEMA.TABLES
-WHERE   TABLE_NAME LIKE 't_'
-ORDER BY TABLE_NAME;
-TABLE_NAME	ENGINE
-t1	MyISAM
-t2	InnoDB
-t3	InnoDB
-t4	InnoDB
 SELECT * FROM t1 ORDER BY a;
 a
 1
@@ -334,15 +327,6 @@ t1
 t2
 t3
 t4
-SELECT   TABLE_NAME,ENGINE
-FROM   INFORMATION_SCHEMA.TABLES
-WHERE   TABLE_NAME LIKE 't_'
-ORDER BY TABLE_NAME;
-TABLE_NAME	ENGINE
-t1	MyISAM
-t2	InnoDB
-t3	InnoDB
-t4	InnoDB
 SELECT * FROM t1 ORDER BY a;
 a
 1
diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index d2cb1ce9518..888298bbb09 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -9,5 +9,3 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-
-rpl_row_create_table    : Bug#45576 2009-12-01 joro rpl_row_create_table fails on PB2
diff --git a/mysql-test/suite/rpl/t/rpl_row_create_table.test b/mysql-test/suite/rpl/t/rpl_row_create_table.test
index 54dcbd24419..e30982da605 100644
--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test
@@ -136,13 +136,9 @@ START SLAVE;
 # BUG#22864 (Rollback following CREATE ... SELECT discards 'CREATE
 # table' from log):
 --echo ================ BUG#22864 ================
-connection slave;
-STOP SLAVE;
-RESET SLAVE;
-connection master;
-RESET MASTER;
-connection slave;
-START SLAVE;
+
+--source include/master-slave-reset.inc
+
 connection master;
 SET AUTOCOMMIT=0;
 CREATE TABLE t1 (a INT);
@@ -160,10 +156,6 @@ INSERT INTO t1 VALUES (4),(5),(6);
 ROLLBACK;
 
 SHOW TABLES;
-SELECT   TABLE_NAME,ENGINE
-  FROM   INFORMATION_SCHEMA.TABLES
- WHERE   TABLE_NAME LIKE 't_'
-ORDER BY TABLE_NAME;
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 SELECT * FROM t3 ORDER BY a;
@@ -173,10 +165,6 @@ SELECT * FROM t4 ORDER BY a;
 SHOW BINLOG EVENTS FROM 106;
 sync_slave_with_master;
 SHOW TABLES;
-SELECT   TABLE_NAME,ENGINE
-  FROM   INFORMATION_SCHEMA.TABLES
- WHERE   TABLE_NAME LIKE 't_'
-ORDER BY TABLE_NAME;
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 SELECT * FROM t3 ORDER BY a;