diff --git a/mysql-test/r/lock_sync.result b/mysql-test/r/lock_sync.result index c750074333f..49ef3bb1b37 100644 --- a/mysql-test/r/lock_sync.result +++ b/mysql-test/r/lock_sync.result @@ -60,8 +60,9 @@ release_lock("lock_bug45143_wait") 1 # Switch to connection 'con_bug45143_1'. # Reap INSERT statement. -Warnings: -Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Statement uses a system function whose value may differ on slave. +# In Statement and Mixed replication mode we get here "Unsafe +# for binlog" warnings. In row mode there are no warnings. +# Hide the discrepancy. # Switch to connection 'con_bug45143_3'. # Reap LOCK TABLES statement. unlock tables; diff --git a/mysql-test/t/lock_sync.test b/mysql-test/t/lock_sync.test index 87804d90510..97388e9c176 100644 --- a/mysql-test/t/lock_sync.test +++ b/mysql-test/t/lock_sync.test @@ -109,7 +109,13 @@ select release_lock("lock_bug45143_wait"); --echo # Switch to connection 'con_bug45143_1'. connection con_bug45143_1; --echo # Reap INSERT statement. +--echo # In Statement and Mixed replication mode we get here "Unsafe +--echo # for binlog" warnings. In row mode there are no warnings. +--echo # Hide the discrepancy. +--disable_warnings --reap +--enable_warnings + --echo # Switch to connection 'con_bug45143_3'. connection con_bug45143_3;