diff options
| author | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
| commit | 1bd213aec31f4c2de242a7fe1baf2373e79bda7d (patch) | |
| tree | 91a12675003778cd8ccbccea5ce47ee09fc46efc /mysql-test/suite/rpl/r/rpl_drop_temp.result | |
| parent | a3cc81fa70e71dd9a40be3c5477eb7a6e8ec4974 (diff) | |
| parent | 8b27f9a05e2f49191b57b8717a31753573981fe7 (diff) | |
| download | mariadb-git-1bd213aec31f4c2de242a7fe1baf2373e79bda7d.tar.gz | |
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_drop_temp.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_drop_temp.result | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_drop_temp.result b/mysql-test/suite/rpl/r/rpl_drop_temp.result index 726b8f2fe54..ffabd514b0f 100644 --- a/mysql-test/suite/rpl/r/rpl_drop_temp.result +++ b/mysql-test/suite/rpl/r/rpl_drop_temp.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 database if not exists mysqltest; use mysqltest; create temporary table mysqltest.t1 (n int)ENGINE=MyISAM; @@ -26,12 +22,7 @@ CREATE TEMPORARY TABLE tmp3 (a int); DROP TEMPORARY TABLE tmp3; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; 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; +include/rpl_reset.inc CREATE TABLE t1 ( i INT ); SHOW STATUS LIKE 'Slave_open_temp_tables'; Variable_name Value @@ -47,3 +38,4 @@ master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( i INT ) master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE ttmp1 ( i INT ) master-bin.000001 # Query # # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ttmp1` DROP TABLE t1; +include/rpl_end.inc |