diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:28:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:28:35 +0100 |
| commit | c1a65228757e25aabccfcf77c494811ed1e5a633 (patch) | |
| tree | b03a8303e1b94c975772db94079ee12e56818c15 /sql/sql_repl.cc | |
| parent | 4cee899fb71226285a34bf20a2380f63c93e3b6d (diff) | |
| parent | d28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (diff) | |
| download | mariadb-git-c1a65228757e25aabccfcf77c494811ed1e5a633.tar.gz | |
merge
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5d508b56dac..717201d5dcc 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1575,7 +1575,7 @@ send_event_to_slave(THD *thd, NET *net, String* const packet, ushort flags, DBUG_EXECUTE_IF("gtid_force_reconnect_at_10_1_100", { rpl_gtid *dbug_gtid; - if ((dbug_gtid= until_binlog_state->find(10,1)) && + if ((dbug_gtid= until_binlog_state->find_nolock(10,1)) && dbug_gtid->seq_no == 100) { DBUG_SET("-d,gtid_force_reconnect_at_10_1_100"); @@ -1585,7 +1585,7 @@ send_event_to_slave(THD *thd, NET *net, String* const packet, ushort flags, } }); - if (until_binlog_state->update(&event_gtid, false)) + if (until_binlog_state->update_nolock(&event_gtid, false)) { my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG; return "Failed in internal GTID book-keeping: Out of memory"; |