From e6cb88eb74415a6e0ff07861fb7bd63eb82be948 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@sun.com>
Date: Thu, 11 Feb 2010 19:10:34 +0300
Subject: [PATCH] next-4284 tree: fix lock_sync.test failure in row based
 replication mode.

---
 mysql-test/r/lock_sync.result | 5 +++--
 mysql-test/t/lock_sync.test   | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

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;