diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-24 15:48:35 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-24 15:48:35 +0100 |
| commit | a2354754a4a9336ce8129ea86e4223cb0f1dc4ab (patch) | |
| tree | 2bba3384a9062b4d9e3a2743eac8c39c16f590f8 /mysql-test/suite/rpl/r | |
| parent | 6781bc56d59974c50a4ef2c96b49d8e827e1a259 (diff) | |
| download | mariadb-git-a2354754a4a9336ce8129ea86e4223cb0f1dc4ab.tar.gz | |
11762407 follow-up fixes to a few tests
Diffstat (limited to 'mysql-test/suite/rpl/r')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_slow_query_log.result | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result index a7d745251d1..55aef7676f1 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result +++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result @@ -13,5 +13,6 @@ include/stop_slave_io.inc RESET SLAVE; drop table t1; call mtr.add_suppression("Slave: Can't get stat of .*"); +call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13"); call mtr.add_suppression("Slave: File.* not found.*"); include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_slow_query_log.result b/mysql-test/suite/rpl/r/rpl_slow_query_log.result index 668a99ffe1b..5bb1ba050a8 100644 --- a/mysql-test/suite/rpl/r/rpl_slow_query_log.result +++ b/mysql-test/suite/rpl/r/rpl_slow_query_log.result @@ -1,6 +1,7 @@ include/master-slave.inc [connection master] CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); +call mtr.add_suppression("Slave SQL: slave SQL thread is being stopped in the middle of applying of a group having updated a non-transaction table; waiting for the group completion"); include/stop_slave.inc SET @old_log_output= @@log_output; SET GLOBAL log_output= 'TABLE'; |