diff options
| author | guilhem@mysql.com <> | 2003-05-27 18:19:32 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-05-27 18:19:32 +0200 |
| commit | eff179ba8f6d968ce18e76d13b5bc5d1fbec4f54 (patch) | |
| tree | dd31d37e433ee59aa1f9501074f34400c58bda9f | |
| parent | da05a3e3f940c5f21815e4a0cde02d0b60c292dd (diff) | |
| parent | cf3cda27784dd9e095a8e5c6b3b118d4201ed37e (diff) | |
| download | mariadb-git-eff179ba8f6d968ce18e76d13b5bc5d1fbec4f54.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
| -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); |