database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge 10-base->10.0

Browse Source
This commit is contained in:
unknown
2013-11-11 23:40:53 +02:00
parent 383de0fd1f 3a75900b91
commit 55de9b0468
50 changed files with 617 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/slave.cc
View File

@ -4582,8 +4582,9 @@ err_during_init:
serial_rgi->thd= rli->sql_driver_thd= 0;
mysql_mutex_lock(&LOCK_thread_count);
THD_CHECK_SENTRY(thd);
delete thd;
thd->rgi_fake= thd->rgi_slave= NULL;
delete serial_rgi;
delete thd;
mysql_mutex_unlock(&LOCK_thread_count);
/*
Note: the order of the broadcast and unlock calls below (first broadcast, then unlock)