diff options
author | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
commit | e7b332ba83f7ecd5dbc518df5d5f4c84fc542552 (patch) | |
tree | a1d34e4650281143b62067088c8965f2cceacb2d /mysql-test/t/lock_sync.test | |
parent | 00dc9a6e70512905ef441274b0574fd2503f15b1 (diff) | |
parent | 08bcd2d8f67dcacd36abd2592fa2a59321abe7c2 (diff) | |
download | mariadb-git-e7b332ba83f7ecd5dbc518df5d5f4c84fc542552.tar.gz |
Merge next-mr -> next-4284.
Diffstat (limited to 'mysql-test/t/lock_sync.test')
-rw-r--r-- | mysql-test/t/lock_sync.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/lock_sync.test b/mysql-test/t/lock_sync.test index 6974a8ec968..87804d90510 100644 --- a/mysql-test/t/lock_sync.test +++ b/mysql-test/t/lock_sync.test @@ -23,6 +23,13 @@ --echo # (TL_WRITE_ALLOW_WRITE) on several instances of the same table and --echo # statements which tried to acquire stronger write lock (TL_WRITE, --echo # TL_WRITE_ALLOW_READ) on this table might have led to deadlock. +# +# Suppress warnings for INSERTs that use get_lock(). +# +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; drop view if exists v1; |