summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index ae9bd8b7727..12228ec3ac8 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -522,6 +522,11 @@ Increase max_allowed_packet on master";
case LOG_READ_EOF:
DBUG_PRINT("wait",("waiting for data in binary log"));
+ if (thd->server_id==0)
+ {
+ pthread_mutex_unlock(log_lock);
+ goto end;
+ }
if (!thd->killed)
{
/* Note that the following call unlocks lock_log */
@@ -611,6 +616,7 @@ Increase max_allowed_packet on master";
}
}
+end:
end_io_cache(&log);
(void)my_close(file, MYF(MY_WME));
@@ -621,7 +627,7 @@ Increase max_allowed_packet on master";
pthread_mutex_unlock(&LOCK_thread_count);
DBUG_VOID_RETURN;
- err:
+err:
thd->proc_info = "waiting to finalize termination";
end_io_cache(&log);
/*