diff options
| author | sasha@mysql.sashanet.com <> | 2001-10-17 14:12:14 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-10-17 14:12:14 -0600 |
| commit | f6321e8b75c3305aa7e167c8c05bbefc68dc1ecf (patch) | |
| tree | 0623843016f3088614d02ce3ca0bfc1f027147d6 /sql | |
| parent | 6a3f93f4861ea2811246753286c0e05673cef065 (diff) | |
| download | mariadb-git-f6321e8b75c3305aa7e167c8c05bbefc68dc1ecf.tar.gz | |
fixed sleep
bug on reconnect
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b550b849a09..15522d87a19 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1481,9 +1481,10 @@ static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) %s, last_errno=%d, retry in %d sec", mc_mysql_error(mysql), last_errno=mc_mysql_errno(mysql), mi->connect_retry); - safe_sleep(thd, mi->connect_retry); } - if (err_count++ == master_retry_count) + safe_sleep(thd, mi->connect_retry); + /* if master_retry_count is not set, keep trying until success */ + if (master_retry_count && err_count++ == master_retry_count) { slave_was_killed=1; break; |