database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge work:/home/bk/mysql-4.0

Browse Source 
into mysql.sashanet.com:/reiser-data/mysql-4.0
This commit is contained in:
sasha@mysql.sashanet.com
2002-03-26 22:23:51 -07:00
parent 6e4b213654 f28f8d086d
commit ab1fdbdeac
20 changed files with 274 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/slave.cc
View File

@@ -345,7 +345,13 @@ int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock,
}
}
DBUG_ASSERT(thd != 0);
KICK_SLAVE(thd);
/* is is criticate to test if the slave is running. Otherwise, we might
be referening freed memory trying to kick it
*/
if (*slave_running)
{
KICK_SLAVE(thd);
}
while (*slave_running)
{
/* there is a small chance that slave thread might miss the first
@@ -367,7 +373,9 @@ int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock,
DBUG_ASSERT_LOCK(cond_lock);
pthread_cond_timedwait(term_cond, cond_lock, &abstime);
if (*slave_running)
{
KICK_SLAVE(thd);
}
}
if (term_lock)
pthread_mutex_unlock(term_lock);