database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0

Browse Source 
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
This commit is contained in:
unknown
2003-07-02 17:37:23 -04:00
parent fd693194c9 71373afb5c
commit 8c113acf96
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_repl.cc
View File

@@ -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);
/*