summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/r/rpl_stm_innodb.result
diff options
context:
space:
mode:
authorSven Sandberg <sven.sandberg@oracle.com>2010-12-19 18:15:12 +0100
committerSven Sandberg <sven.sandberg@oracle.com>2010-12-19 18:15:12 +0100
commit1bd213aec31f4c2de242a7fe1baf2373e79bda7d (patch)
tree91a12675003778cd8ccbccea5ce47ee09fc46efc /mysql-test/suite/rpl/r/rpl_stm_innodb.result
parenta3cc81fa70e71dd9a40be3c5477eb7a6e8ec4974 (diff)
parent8b27f9a05e2f49191b57b8717a31753573981fe7 (diff)
downloadmariadb-git-1bd213aec31f4c2de242a7fe1baf2373e79bda7d.tar.gz
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_stm_innodb.result')
-rw-r--r--mysql-test/suite/rpl/r/rpl_stm_innodb.result9
1 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stm_innodb.result b/mysql-test/suite/rpl/r/rpl_stm_innodb.result
index f99457faaf0..0e9531317b9 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_innodb.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_innodb.result
@@ -1,9 +1,5 @@
-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;
+include/master-slave.inc
+[connection master]
CREATE TABLE t4 (
id INT(5) unsigned NOT NULL auto_increment,
name varchar(15) NOT NULL default '',
@@ -130,3 +126,4 @@ id b
DROP TABLE t1;
DROP TABLE t3;
End of 6.0 tests
+include/rpl_end.inc