diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:08:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:08:51 +0200 |
| commit | 9809f05199aeb0b67991fac41bd86f38730768dc (patch) | |
| tree | fa2792ff86d0da014b535d743759810612338042 /mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result | |
| parent | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (diff) | |
| parent | 5a0e7394a5ae0c7b6a1ea35b7ea3a8985325987a (diff) | |
| download | mariadb-git-9809f05199aeb0b67991fac41bd86f38730768dc.tar.gz | |
5.5-merge
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result index 38806e2b66d..f24f34fa0bf 100644 --- a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result +++ b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.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 t1 (n int auto_increment primary key); set insert_id = 2000; insert into t1 values (NULL),(NULL),(NULL); @@ -17,6 +13,7 @@ Server_id Host Port Master_id 2 127.0.0.1 9999 1 drop table t1; stop slave; +include/wait_for_slave_to_stop.inc create table t2(id int auto_increment primary key, created datetime); SET TIME_ZONE= '+03:00'; set timestamp=12345; @@ -28,6 +25,7 @@ create table t3 like t2; create temporary table t4 like t2; create table t5 select * from t4; start slave; +include/wait_for_slave_to_start.inc select * from t2; id created 1 1970-01-01 06:25:45 @@ -45,3 +43,4 @@ t5 CREATE TABLE `t5` ( `created` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t2,t3,t5; +include/rpl_end.inc |