bzr commit into mysql-5.1-bugteam branch (Dao-Gang.Qu:3031) Bug#45214

[Dao-Gang.Qu]

#At file:///home/daogangq/mysql/bzrwork/bug45214no/5.1-bugteam/ based on revid:dao-gang.qu@stripped

 3031 Dao-Gang.Qu@stripped	2009-07-17
      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.

    modified:
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      sql/slave.cc
=== modified file 'mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test'
--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test	2009-07-16 06:56:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test	2009-07-17 05:07:43 +0000
@@ -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`;

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2009-07-16 06:56:43 +0000
+++ b/sql/slave.cc	2009-07-17 05:07:43 +0000
@@ -906,7 +906,6 @@ static int get_master_version_and_clock(
   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


Attachment: [text/bzr-bundle] bzr/[e-mail]