List:Commits« Previous MessageNext Message »
From:Dao-Gang.Qu Date:July 17 2009 5:03am
Subject:bzr commit into mysql-5.4 branch (Dao-Gang.Qu:3471) Bug#45214
View as plain text  
#At file:///home/daogangq/mysql/bzrwork/bug45214no/mysql-pe/ based on revid:dao-gang.qu@stripped

 3471 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 resolveing problems, which have been brought by committing 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:53:31 +0000
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test	2009-07-17 05:03:10 +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:53:31 +0000
+++ b/sql/slave.cc	2009-07-17 05:03:10 +0000
@@ -1192,7 +1192,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;
 
   err_msg.length(0);
   /*


Attachment: [text/bzr-bundle] bzr/dao-gang.qu@sun.com-20090717050310-syzzfuwr9renvktu.bundle
Thread
bzr commit into mysql-5.4 branch (Dao-Gang.Qu:3471) Bug#45214Dao-Gang.Qu17 Jul