diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 16:56:27 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 16:56:27 -0400 |
| commit | 71373afb5c48a27bde3e80a5207a14101d740cc8 (patch) | |
| tree | a24cfc3258f8fadc09648c709f6ae4f9c22ef8c4 /sql/sql_repl.cc | |
| parent | 32592ab8c1a331f3bbd52dbd62f738ba82d29ea6 (diff) | |
| download | mariadb-git-71373afb5c48a27bde3e80a5207a14101d740cc8.tar.gz | |
fixed bug #672
client/mysqlbinlog.cc:
changed format of eof-packet for protocol 4.1
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 283dd20a56c..bc833d7e759 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -503,6 +503,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 */ @@ -590,6 +595,7 @@ Increase max_allowed_packet on master"; } } +end: end_io_cache(&log); (void)my_close(file, MYF(MY_WME)); @@ -600,7 +606,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); /* |