diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-04-01 15:07:10 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-04-01 15:07:10 +0200 |
| commit | c677fea7d01ef1fab3357496b309a3e3b3c00dfe (patch) | |
| tree | b6000be3447e5a41440cffee8b8d927d37a1dcde /mysql-test/suite/rpl/r/rpl_row_annotate_do.result | |
| parent | 09bd2894973fbdbacec9bfc31a3635165b120200 (diff) | |
| parent | 9aa44bb4b3e0fc69306626b961c7d9309e6ab114 (diff) | |
| download | mariadb-git-c677fea7d01ef1fab3357496b309a3e3b3c00dfe.tar.gz | |
Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_row_annotate_do.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_annotate_do.result | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result index 34405b9cbba..0ece93e7aa5 100644 --- a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result +++ b/mysql-test/suite/rpl/r/rpl_row_annotate_do.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] ######################################################################## # TABLES ON MASTER ######################################################################## @@ -142,3 +138,4 @@ a b # No Annotate_rows events should appear below ######################################################################## FLUSH LOGS; +include/rpl_end.inc |