diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
| commit | e642701c325e7b557d1a16d98f110581c26c2f28 (patch) | |
| tree | 6fc830df498046ca29b2381fb809726faeb04f52 /mysql-test/suite/binlog/t/binlog_tmp_table.test | |
| parent | a0f8951963443db308d072dbc0794bb93d2fcf45 (diff) | |
| parent | b6dcd0ecbee17787297e882ed63cf4e13d981943 (diff) | |
| download | mariadb-git-e642701c325e7b557d1a16d98f110581c26c2f28.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
Diffstat (limited to 'mysql-test/suite/binlog/t/binlog_tmp_table.test')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_tmp_table.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_tmp_table.test b/mysql-test/suite/binlog/t/binlog_tmp_table.test index 3a245fa01e4..982ba9eedac 100644 --- a/mysql-test/suite/binlog/t/binlog_tmp_table.test +++ b/mysql-test/suite/binlog/t/binlog_tmp_table.test @@ -28,6 +28,10 @@ source include/have_log_bin.inc; source include/have_binlog_format_mixed_or_statement.inc; +--disable_query_log +CALL mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT"); +--enable_query_log + connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,); @@ -55,10 +59,12 @@ delete from tmp1_foo where a < 5; connection master1; delete from tmp2_foo where a < 5; +--disable_warnings connection master; insert into foo select * from tmp1_foo; connection master1; insert into foo select * from tmp2_foo; +--enable_warnings connection master; truncate table tmp1_foo; |