diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-07 13:37:16 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-07 13:37:16 +0400 |
| commit | 762b535de2104cd08b10a1a41f16f9df1371b95d (patch) | |
| tree | 385aedcde4e00b31a7b5e1b308d16b5460be7b94 /mysql-test/r/archive.result | |
| parent | 21b8741b57204f784633c6337f9abacaa59ff3e2 (diff) | |
| parent | 7af6ac8f3ed64333f3dcb87c15e93bcfafd66bf1 (diff) | |
| download | mariadb-git-762b535de2104cd08b10a1a41f16f9df1371b95d.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/engines/funcs/t/disabled.def
- mysql-test/suite/engines/iuds/t/disabled.def
- mysql-test/suite/engines/iuds/t/insert_number.test
Diffstat (limited to 'mysql-test/r/archive.result')
| -rw-r--r-- | mysql-test/r/archive.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index 1508c49c26c..88f38a13b4a 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -1,4 +1,4 @@ -CALL mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT"); +CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); DROP TABLE if exists t1,t2,t3,t4,t5,t6; SET storage_engine=ARCHIVE; CREATE TABLE t1 ( |