Commit 28e66cdd authored by 's avatar

Bug #45214 get_master_version_and_clock does not report error when queries fail

Append the patch for resolving the problems, which have been brought by commiting bug#45214.
parent e9dcd96f
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# #
source include/master-slave.inc; source include/master-slave.inc;
source include/have_debug.inc;
#Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection
connection slave; connection slave;
let $debug_saved= `select @@global.debug`; let $debug_saved= `select @@global.debug`;
......
...@@ -906,7 +906,6 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) ...@@ -906,7 +906,6 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
MYSQL_RES *master_res= 0; MYSQL_RES *master_res= 0;
MYSQL_ROW master_row; MYSQL_ROW master_row;
DBUG_ENTER("get_master_version_and_clock"); DBUG_ENTER("get_master_version_and_clock");
int query_re= 0;
/* /*
Free old description_event_for_queue (that is needed if we are in Free old description_event_for_queue (that is needed if we are in
......
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