bzr commit into mysql-6.0-rpl branch (zhenxing.he:2736) Bug#40459

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/b40459/6.0-rpl/

 2736 He Zhenxing	2008-12-15
      BUG#40459 sporadic failure in rpl_ndb_denote_gap: lost connection during "stop
slave"
      
      When slave failed to set the heartbeat period, it did not set err_code
      to a non-zero value, which caused the assertion to fail.
      
      This patch fixed it by setting err_code to ER_SLAVE_FATAL_ERROR in this case.
modified:
  sql/slave.cc

per-file messages:
  sql/slave.cc
    Set err_code when slave failed to set the heartbeat period
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2008-11-12 15:23:22 +0000
+++ b/sql/slave.cc	2008-12-15 08:51:15 +0000
@@ -1126,6 +1126,7 @@ static int get_master_version_and_clock(
       err_msg.append(mysql_error(mysql));
       err_msg.append("'");
       mysql_free_result(mysql_store_result(mysql));
+      err_code= ER_SLAVE_FATAL_ERROR;
       goto err;
     }
     mysql_free_result(mysql_store_result(mysql));