database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug #45214 get_master_version_and_clock does not report error when queries fail

Browse Source 
Append the patch for resolving the problems, which have been brought by commiting bug#45214.
This commit is contained in:
2009-07-17 13:07:43 +08:00
parent e9dcd96f0c
commit 28e66cdd81
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
View File

@ -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`;

1
sql/slave.cc
View File

@ -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