diff options
| author | unknown <guilhem@mysql.com> | 2003-05-27 18:19:32 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-05-27 18:19:32 +0200 |
| commit | da8f7ecadd2abcf4a5908cd2a729f7e794138ef6 (patch) | |
| tree | dd31d37e433ee59aa1f9501074f34400c58bda9f /sql | |
| parent | 510e23a8cd431351f7d733a7583a5ad3c2470c48 (diff) | |
| parent | c1607401de71e400b5d2c1e1e1351edbe428cd4e (diff) | |
| download | mariadb-git-da8f7ecadd2abcf4a5908cd2a729f7e794138ef6.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b620603dc63..b655b17c258 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1320,11 +1320,7 @@ static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli) while (rli->log_space_limit < rli->log_space_total && !(slave_killed=io_slave_killed(thd,mi)) && !rli->ignore_log_space_limit) - { pthread_cond_wait(&rli->log_space_cond, &rli->log_space_lock); - /* Re-acquire the mutex as pthread_cond_wait released it */ - pthread_mutex_lock(&rli->log_space_lock); - } thd->proc_info = save_proc_info; pthread_mutex_unlock(&rli->log_space_lock); DBUG_RETURN(slave_killed); |