diff options
| author | monty@hundin.mysql.fi <> | 2002-06-02 21:22:20 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-02 21:22:20 +0300 |
| commit | 6e54cc492c424a7697a7139600b67b9cfe36a5da (patch) | |
| tree | 3ff8869368f9ada509521ec47ec79586d3c86167 /sql/slave.cc | |
| parent | d1e13bec397f4aa737c3dff85dbb01ae526d9429 (diff) | |
| download | mariadb-git-6e54cc492c424a7697a7139600b67b9cfe36a5da.tar.gz | |
Extension of .frm file (not yet ready for push)
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 8461b72f4c6..7de3022f551 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1104,14 +1104,16 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo) static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli) { - bool slave_killed; + bool slave_killed=0; MASTER_INFO* mi = rli->mi; const char* save_proc_info; THD* thd = mi->io_thd; DBUG_ENTER("wait_for_relay_log_space"); + pthread_mutex_lock(&rli->log_space_lock); save_proc_info = thd->proc_info; thd->proc_info = "Waiting for relay log space to free"; + while (rli->log_space_limit < rli->log_space_total && !(slave_killed=io_slave_killed(thd,mi))) { |