diff options
| author | unknown <stewart@mysql.com> | 2005-07-18 15:02:21 +1000 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-07-18 15:02:21 +1000 |
| commit | 78625366af3bb66f1cc200d7f22483fe4fd01afd (patch) | |
| tree | 55e3cfc1489d4779d6ab4a03c478a99e69079758 /sql/slave.cc | |
| parent | 86060eb487ea003213c6d554b75434ef931cf46f (diff) | |
| parent | e155a0c01d6c672e92d70abc24e6630a802be391 (diff) | |
| download | mariadb-git-78625366af3bb66f1cc200d7f22483fe4fd01afd.tar.gz | |
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
sql/slave.cc:
Auto merged
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 d5d3ab19c01..86611566b93 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2753,7 +2753,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 || error == ETIME) + if (error == ETIMEDOUT) { error= -1; break; |