bzr commit into mysql-5.1-rep+2 branch (zhenxing.he:3137) Bug#37714

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/merge/5.1-rep%2B2-delivery1/ based on revid:zhenxing.he@stripped

 3137 He Zhenxing	2009-10-27
      Backport Bug #37714 rpl.rpl_heartbeat fails sporadically in pushbuild due to timeout
      
      rpl_backup_multi revealed the assert
      DBUG_ASSERT(ret == 0 && signal_cnt != mysql_bin_log.signal_cnt || thd->killed)
      does not hold in a case of multiple dump threads. A waiting for binlog update
      thread can catch a broad-cast signal without the binlog having actually refreshed
      
      The assert is removed.
     @ sql/sql_repl.cc
        assert does not hold in a case of multiple dump threads. A waiting for binlog update thread can catch a broad-cast signal without the binlog having actually refreshed.

    M  sql/sql_repl.cc
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2009-10-14 05:24:47 +0000
+++ b/sql/sql_repl.cc	2009-10-27 09:17:18 +0000
@@ -861,9 +861,7 @@ impossible position";
             }
             else
             {
-              DBUG_ASSERT(ret == 0 && signal_cnt != mysql_bin_log.signal_cnt ||
-                          thd->killed);
-              DBUG_PRINT("wait",("binary log received update"));
+              DBUG_PRINT("wait",("binary log received update or a broadcast signal caught"));
             }
           } while (signal_cnt == mysql_bin_log.signal_cnt && !thd->killed);
           pthread_mutex_unlock(log_lock);


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