From: Andrei Elkin
Date: November 9 2010 6:48am
Subject: bzr push into mysql-next-mr branch (andrei.elkin:3193 to 3195) Bug#58063
List-Archive: http://lists.mysql.com/commits/123171
X-Bug: 58063
Message-Id: <201011090648.oA96mPBq020946@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1802625457=="

--===============1802625457==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3195 Andrei Elkin	2010-11-09
      Bug #58063
      
      The 2nd commit disables rpl_delayed_slave due to
      Bug@57514  rpl_delayed_slave fails sporadically in pb

    modified:
      mysql-test/suite/rpl/t/disabled.def
 3194 Andrei Elkin	2010-11-08
      Bug #58063  	rpl_server_uuid segfaults on win
      
      This is an intermediate patch to get more details out of the failure.
     @ sql/log_event.cc
        compilation warning is fixed.
     @ sql/rpl_slave.cc
        Printing out more info in case Win run of rpl_server_id discovers unexpected NULL
        as the value of @master_binlog_checksum.

    modified:
      sql/log_event.cc
      sql/rpl_slave.cc
 3193 Andrei Elkin	2010-11-08
      wl#2540 (testing)
      
      disabling binlog_unsafe locally due to  Bug#56678

    modified:
      mysql-test/suite/binlog/t/disabled.def
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2010-10-25 19:02:24 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2010-11-09 06:46:19 +0000
@@ -13,3 +13,4 @@
 rpl_row_create_table      : Bug#51574 2010-02-27 andrei failed different way than earlier with bug#45576
 rpl_spec_variables        : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
 rpl_row_event_max_size    : Bug#55675 2010-10-25 andrei mysql_binlog_send attempts to read events partly
+rpl_delayed_slave         : Bug#57514 2010-11-09 andrei rpl_delayed_slave fails sporadically in pb

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-11-02 19:57:34 +0000
+++ b/sql/log_event.cc	2010-11-08 21:00:21 +0000
@@ -739,7 +739,7 @@ const char* Log_event::get_type_str()
 #ifndef MYSQL_CLIENT
 Log_event::Log_event(THD* thd_arg, uint16 flags_arg, bool using_trans)
   :log_pos(0), temp_buf(0), exec_time(0), flags(flags_arg),
-   cache_type(Log_event::EVENT_INVALID_CACHE), thd(thd_arg), crc(0),
+   cache_type(Log_event::EVENT_INVALID_CACHE), crc(0), thd(thd_arg),
    checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF)
 {
   server_id=	thd->server_id;

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-11-02 12:43:13 +0000
+++ b/sql/rpl_slave.cc	2010-11-08 21:00:21 +0000
@@ -1691,6 +1691,7 @@ when it try to get the value of TIME_ZON
                   goto past_checksum;);
   {
     int rc;
+    ulong thread_id= mysql->thread_id;
     const char query[]= "SET @master_binlog_checksum= @@global.binlog_checksum";
     master_res= NULL;
     mi->checksum_alg_before_fd= BINLOG_CHECKSUM_ALG_UNDEF; //initially undefined
@@ -1742,6 +1743,19 @@ when it try to get the value of TIME_ZON
           (master_res= mysql_store_result(mysql)) &&
           (master_row= mysql_fetch_row(master_res)))
       {
+#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


--===============1802625457==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl2540/
# testament_sha1: 0eb1980a2686a437b6a619fc59dd7332fa5928a5
# timestamp: 2010-11-09 08:48:25 +0200
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\
#   next-rm-wl2540-checksum/
# base_revision_id: andrei.elkin@stripped\
#   jlzj3kb6vvh0ud6u
# 
# Begin bundle
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


--===============1802625457==--