List:Commits« Previous MessageNext Message »
From:Luis Soares Date:May 26 2010 2:22am
Subject:bzr commit into mysql-5.1-rep+3 branch (luis.soares:3141) Bug#44209
View as plain text  
#At file:///home/lsoares/Workspace/bzr/work/tests/mysql-5.1-rep%2B3/ based on revid:luis.soares@stripped

 3141 Luis Soares	2010-05-26
      BUG#44209: MASTER_CONNECT_RETRY and --master-retry-count disconnected 
      from each other
      
      Post-push fix.
      
      The mi->retry_count was set to an uninitilized value when master.info
      did not contain a correspondent line for the retry_count value. We fix
      this by setting the default before actually loading the value from
      master.info. If there is no value to read, mi->retry_count remains the
      default (or the value set in the command line). The retry_count in 
      master.info value takes precedence over the one from the command line
      (which I believe is more inline with the proposal for deprecation of 
      master-retry-count).

    modified:
      sql/rpl_mi.cc
=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2010-04-19 21:34:43 +0000
+++ b/sql/rpl_mi.cc	2010-05-26 02:22:17 +0000
@@ -241,7 +241,7 @@ file '%s')", fname);
     int ssl= 0, ssl_verify_server_cert= 0;
     float master_heartbeat_period= 0.0;
     char *first_non_digit;
-    long retry_count;
+    long retry_count= master_retry_count;
 
     /*
        Starting from 4.1.x master.info has new format. Now its


Attachment: [text/bzr-bundle] bzr/luis.soares@sun.com-20100526022217-vgrsikd2xmyyqiie.bundle
Thread
bzr commit into mysql-5.1-rep+3 branch (luis.soares:3141) Bug#44209Luis Soares26 May