diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
| commit | ae107c55811078b2154911accdeafb32d6b97271 (patch) | |
| tree | a17e4b5853a3e4a0c4dcfcf7083591ba01362f80 /mysql-test/t/sp_trans.test | |
| parent | 73b296c4c4d7c03528f33f0c6f1c91905ec7b8e6 (diff) | |
| parent | c1584c98010515b3c51c1d0987b824182e0610aa (diff) | |
| download | mariadb-git-ae107c55811078b2154911accdeafb32d6b97271.tar.gz | |
Manual merge 5.1-rep+2 to 5.1-rep+3
Diffstat (limited to 'mysql-test/t/sp_trans.test')
| -rw-r--r-- | mysql-test/t/sp_trans.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/sp_trans.test b/mysql-test/t/sp_trans.test index 4c9eb985adf..75659cd84e0 100644 --- a/mysql-test/t/sp_trans.test +++ b/mysql-test/t/sp_trans.test @@ -5,6 +5,10 @@ -- source include/have_log_bin.inc -- source include/have_innodb.inc +disable_query_log; +call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT"); +enable_query_log; + --disable_warnings drop table if exists t1, t2, t3; --enable_warnings |