bzr commit into mysql-next-mr branch (luis.soares:3196)

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/57950/mysql-next-mr-wl2540/ based on revid:andrei.elkin@stripped

 3196 Luis Soares	2010-11-10
      BUG 58063: work in progress.

    modified:
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-11-08 21:00:21 +0000
+++ b/sql/rpl_slave.cc	2010-11-10 12:52:30 +0000
@@ -1741,21 +1741,9 @@ when it try to get the value of TIME_ZON
       if (!mysql_real_query(mysql,
                             STRING_WITH_LEN("SELECT @master_binlog_checksum")) &&
           (master_res= mysql_store_result(mysql)) &&
-          (master_row= mysql_fetch_row(master_res)))
+          (master_row= mysql_fetch_row(master_res)) &&
+          (master_row[0] != NULL))
       {
-#ifndef DBUG_OFF
-        if (master_row[0] == NULL)
-        {
-          errmsg= "The slave I/O thread stops because a fatal error is "
-            "encountered when it tried to SELECT @master_binlog_checksum. "
-            "The setting time thread_id %lu, the current thread_i %lu; "
-            "reconnecting %d.";
-          err_code= ER_SLAVE_FATAL_ERROR;
-          sprintf(err_buff, errmsg, thread_id, mysql->thread_id,
-                  mysql->reconnect);
-          goto err;
-        }
-#endif
         mi->checksum_alg_before_fd= (uint8)
           find_type(master_row[0], &binlog_checksum_typelib, 1) - 1;
         // valid outcome is either of
@@ -4805,7 +4793,6 @@ replication resumed in log '%s' at posit
     thd->set_active_vio(mysql->net.vio);
 #endif
   }
-  mysql->reconnect= 1;
   DBUG_PRINT("exit",("slave_was_killed: %d", slave_was_killed));
   DBUG_RETURN(slave_was_killed);
 }


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