From 28e66cdd8151cdee1a58519e39896164d6e3da0d Mon Sep 17 00:00:00 2001 From: Date: Fri, 17 Jul 2009 13:07:43 +0800 Subject: [PATCH] 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. --- mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test | 2 +- sql/slave.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test index 3084bfc32fc..40d11f2cec2 100644 --- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test +++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test @@ -15,7 +15,7 @@ # 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 connection slave; let $debug_saved= `select @@global.debug`; diff --git a/sql/slave.cc b/sql/slave.cc index 10014b083d8..83a4d8c73d1 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -906,7 +906,6 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) MYSQL_RES *master_res= 0; MYSQL_ROW master_row; DBUG_ENTER("get_master_version_and_clock"); - int query_re= 0; /* Free old description_event_for_queue (that is needed if we are in