diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 17:37:23 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 17:37:23 -0400 |
| commit | 8c113acf966cb0dab9684d781323a34029e76700 (patch) | |
| tree | a2b49fdf472ff139ea37a0b778aae5c8b78ff47c /sql/sql_repl.cc | |
| parent | fd693194c9620078d61d77eae5e62fb4f5235942 (diff) | |
| parent | 71373afb5c48a27bde3e80a5207a14101d740cc8 (diff) | |
| download | mariadb-git-8c113acf966cb0dab9684d781323a34029e76700.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0
client/mysqlbinlog.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
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 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); /* |