diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-23 12:54:58 +0100 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-23 12:54:58 +0100 |
commit | b027d104382e1e1a2e69847a06d849032213f1d6 (patch) | |
tree | 597fc443436c6ee13ba71d8d2b703bb51ff429cc /mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result | |
parent | 2c4f6e5c632f02880490191f5a8ea407f4d35ade (diff) | |
parent | 8b3f9560200717a4f06be01e991f4c6ee4758504 (diff) | |
download | mariadb-git-b027d104382e1e1a2e69847a06d849032213f1d6.tar.gz |
Upmerge 11762407 (54999) with additions
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result index 48e866cd2ad..5936c64d0ca 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result +++ b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result @@ -11,6 +11,8 @@ insert into tm set a=null; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction. commit; +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"); +call mtr.add_suppression("Slave SQL.*The slave SQL is stopped, leaving the current group of events unfinished with a non-transaction table changed."); include/wait_for_slave_sql_to_stop.inc SELECT "NO" AS Last_SQL_Error, @check as `true`; Last_SQL_Error true |