#At file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug45576-row_create_table-fails/ based on revid:sergey.glukhov@stripped
3346 Andrei Elkin 2010-02-19
bug#45576
a small cleanup for the test
modified:
mysql-test/suite/rpl/r/rpl_row_create_table.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_row_create_table.test
=== modified file 'mysql-test/suite/rpl/r/rpl_row_create_table.result'
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result 2009-11-27 13:34:39 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result 2010-02-19 09:44:42 +0000
@@ -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
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2009-12-01 09:21:15 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2010-02-19 09:44:42 +0000
@@ -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
=== modified file 'mysql-test/suite/rpl/t/rpl_row_create_table.test'
--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test 2009-11-27 13:34:39 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test 2010-02-19 09:44:42 +0000
@@ -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;
Attachment: [text/bzr-bundle] bzr/aelkin@mysql.com-20100219094442-1q8yy03luqfr20sw.bundle
