summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-10-20 11:27:03 +0300
committermonty@hundin.mysql.fi <>2001-10-20 11:27:03 +0300
commit4eb41be6ff4190eae314df233863149fc76103b3 (patch)
treec632764af9d21e2f3fbcf265425a4dc16ddb173c /sql
parentb58873ae15cd4c2dd7442d742094d4e8433dbdd1 (diff)
downloadmariadb-git-4eb41be6ff4190eae314df233863149fc76103b3.tar.gz
Fix after merge
Diffstat (limited to 'sql')
-rw-r--r--sql/slave.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 376a8818d0a..11224421ccc 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1299,8 +1299,8 @@ 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);
}
+ safe_sleep(thd, mi->connect_retry);
/* by default we try forever. The reason is that failure will trigger
master election, so if the user did not set master_retry_count we
do not want to have electioin triggered on the first failure to