diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-11-15 11:30:58 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-11-15 11:30:58 +0800 |
| commit | 558feaa2087397d43a48116743dcdaee9558485e (patch) | |
| tree | 131f1120d85f739642867037e228ab781a83a191 /mysql-test/suite | |
| parent | 9220e09fbc3b33f0dd4858a52e17789e83dbca61 (diff) | |
| download | mariadb-git-558feaa2087397d43a48116743dcdaee9558485e.tar.gz | |
Postfix after merge
After fix of bug46322, logging to table is turned off, each test
that need this should turn on it in it's opt file.
Add suppression to unsafe statement warnings for binlog_unsafe.test.
mysql-test/suite/binlog/t/binlog_unsafe-master.opt:
After fix of bug46322, logging to table is turned off, each test that need this should turn on it in it's opt file.
mysql-test/suite/binlog/t/binlog_unsafe.test:
suppress Unsafe statement warnings
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_unsafe-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_unsafe.test | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt index 7d8786c156a..78bcdd89270 100644 --- a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt +++ b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt @@ -1 +1 @@ -$UDF_EXAMPLE_LIB_OPT +$UDF_EXAMPLE_LIB_OPT --log-output=file,table diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test index 8fb09fe9ab7..34c1dc0cd01 100644 --- a/mysql-test/suite/binlog/t/binlog_unsafe.test +++ b/mysql-test/suite/binlog/t/binlog_unsafe.test @@ -96,6 +96,10 @@ --source include/have_log_bin.inc --source include/have_binlog_format_statement.inc +--disable_query_log +call mtr.add_suppression("Unsafe statement binlogged in statement format"); +--enable_query_log + --echo #### Setup tables #### CREATE TABLE t0 (a CHAR(100)); |