bzr commit into mysql-6.0-rpl branch (aelkin:2866) Bug#37714

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/mysql-6.0-rpl/ based on revid:zhenxing.he@stripped

 2866 Andrei Elkin	2009-06-16
      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.
modified:
  sql/sql_repl.cc

per-file messages:
  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.
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2009-06-15 14:00:15 +0000
+++ b/sql/sql_repl.cc	2009-06-16 12:47:31 +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);