Commit 4eb41be6 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

Fix after merge

parent b58873ae
...@@ -1299,8 +1299,8 @@ static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) ...@@ -1299,8 +1299,8 @@ static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi)
%s, last_errno=%d, retry in %d sec", %s, last_errno=%d, retry in %d sec",
mc_mysql_error(mysql), last_errno=mc_mysql_errno(mysql), mc_mysql_error(mysql), last_errno=mc_mysql_errno(mysql),
mi->connect_retry); 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 /* 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 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 do not want to have electioin triggered on the first failure to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment