bzr push into mysql-6.0-bugteam branch (aelkin:2987 to 2988) Bug#37714

[Andrei Elkin]

 2988 Andrei Elkin	2009-01-30
      Bug #37714 rpl.rpl_heartbeat fails sporadically in pushbuild due to timeout
      
      Finally there happened to be the timeout again:
      https://intranet.mysql.com/secure/pushbuild/showpush.pl?dir=bzr_mysql-6.0-bugteam&order=458
      
      The test is conditionally disabled not to run on windows.
      
      Todo: remove +-- source include/not_windows.inc upon the case's been fixed.
modified:
  mysql-test/suite/rpl/t/rpl_heartbeat.test

 2987 Davi Arnaut	2009-01-29 [merge]
      Merge from upstream 6.0-bugteam
added:
  mysql-test/suite/binlog/r/binlog_tmp_table.result
  mysql-test/suite/binlog/t/binlog_tmp_table.test
modified:
  mysql-test/lib/mtr_report.pl
  mysql-test/r/subselect.result
  mysql-test/r/subselect3.result
  mysql-test/r/subselect3_jcl6.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/t/subselect.test
  mysql-test/t/subselect3.test
  mysql-test/t/user_limits.test
  sql/item_cmpfunc.cc
  sql/sql_delete.cc
  sql/sql_select.cc
  sql/sql_table.cc

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test	2008-03-27 10:09:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-01-30 14:25:16 +0000
@@ -8,6 +8,7 @@
 # - SHOW STATUS like 'Slave_heartbeat_period' report
 
 -- source include/have_log_bin.inc
+-- source include/not_windows.inc
 
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);