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

Merged BUG#12574820 from 5.1 to 5.5

Browse Source 
Two conflicts resolved manually:
Text conflict in sql/log.cc
Text conflict in sql/mysqld.cc
This commit is contained in:
Sven Sandberg
2011-05-26 12:56:17 +02:00
parent 9d42d36e7e de3776819c
commit add86aaddc
4 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysqld.cc
View File

@ -2070,6 +2070,12 @@ void unlink_thd(THD *thd)
thd_cleanup(thd);
dec_connection_count();
mysql_mutex_lock(&LOCK_thread_count);
/*
Used by binlog_reset_master. It would be cleaner to use
DEBUG_SYNC here, but that's not possible because the THD's debug
sync feature has been shut down at this point.
*/
DBUG_EXECUTE_IF("sleep_after_lock_thread_count_before_delete_thd", sleep(5););
delete_thd(thd);
DBUG_VOID_RETURN;
}