diff options
| author | monty@mysql.com <> | 2005-10-12 00:59:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-12 00:59:52 +0300 |
| commit | 5513ab69b76add2457b5288849484460fae78504 (patch) | |
| tree | 7613691c50c9b918d5dbcb5683e2672e06db2a71 /sql/slave.cc | |
| parent | 38a470794de2b5361fcc6166a1bdd8f5aa1cfd7f (diff) | |
| parent | f5fdf3e87a5f60fdb6442912ae5741a24b2461c8 (diff) | |
| download | mariadb-git-5513ab69b76add2457b5288849484460fae78504.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 0e810b798f9..821b1c66d5c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2747,7 +2747,7 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name, else pthread_cond_wait(&data_cond, &data_lock); DBUG_PRINT("info",("Got signal of master update or timed out")); - if (error == ETIMEDOUT) + if (error == ETIMEDOUT || error == ETIME) { error= -1; break; |