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_stm_000001.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_stm_000001.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_stm_000001.result | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stm_000001.result b/mysql-test/suite/rpl/r/rpl_stm_000001.result index 7fd9a6a9c92..65715b471aa 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_000001.result +++ b/mysql-test/suite/rpl/r/rpl_stm_000001.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] CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); create table t1 (word char(20) not null); load data infile '../../std_data/words.dat' into table t1; @@ -40,6 +36,7 @@ stop slave; reset slave; lock tables t1 read; start slave; +include/sync_slave_io_with_master.inc unlock tables; create table t2(id int); insert into t2 values(connection_id()); @@ -52,8 +49,7 @@ select (@id := id) - id from t2; kill @id; drop table t2; Got one of the listed errors -set global sql_slave_skip_counter=1; -start slave; +include/wait_for_slave_sql_error_and_skip.inc [errno=1053] select count(*) from t1; count(*) 5000 @@ -82,3 +78,4 @@ select_priv user Y blafasel2 drop table t1; delete from mysql.user where user="blafasel2"; +include/rpl_end.inc |