Skip to content

Commit bca1fec

Browse files
author
Konstantin Osipov
committed
next-4284 tree:
fix lock_sync.test failure in row based replication mode.
1 parent 8bd1e19 commit bca1fec

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

mysql-test/r/lock_sync.result

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ release_lock("lock_bug45143_wait")
6060
1
6161
# Switch to connection 'con_bug45143_1'.
6262
# Reap INSERT statement.
63-
Warnings:
64-
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.
63+
# In Statement and Mixed replication mode we get here "Unsafe
64+
# for binlog" warnings. In row mode there are no warnings.
65+
# Hide the discrepancy.
6566
# Switch to connection 'con_bug45143_3'.
6667
# Reap LOCK TABLES statement.
6768
unlock tables;

mysql-test/t/lock_sync.test

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,13 @@ select release_lock("lock_bug45143_wait");
109109
--echo # Switch to connection 'con_bug45143_1'.
110110
connection con_bug45143_1;
111111
--echo # Reap INSERT statement.
112+
--echo # In Statement and Mixed replication mode we get here "Unsafe
113+
--echo # for binlog" warnings. In row mode there are no warnings.
114+
--echo # Hide the discrepancy.
115+
--disable_warnings
112116
--reap
117+
--enable_warnings
118+
113119

114120
--echo # Switch to connection 'con_bug45143_3'.
115121
connection con_bug45143_3;

0 commit comments

Comments
 (0)