bzr push into mysql-5.1 branch (sven:2623)

[Sven Sandberg]

 2623 Sven Sandberg	2008-07-08 [merge]
      merged in disabled test cases
added:
  mysql-test/include/sync_slave_io_with_master.inc
  mysql-test/suite/rpl/r/rpl_bug26395.result
  mysql-test/suite/rpl/t/rpl_bug26395-master.opt
  mysql-test/suite/rpl/t/rpl_bug26395-slave.opt
  mysql-test/suite/rpl/t/rpl_bug26395.test
renamed:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result => mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt => mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt => mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test
modified:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt
  mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test

=== modified file 'mysql-test/suite/rpl/t/rpl_insert.test'
--- a/mysql-test/suite/rpl/t/rpl_insert.test	2008-04-01 12:40:23 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert.test	2008-07-07 15:38:47 +0000
@@ -13,6 +13,9 @@ USE mysqlslap;
 
 CREATE TABLE t1 (id INT, name VARCHAR(64));
 
+sync_slave_with_master;
+connection master;
+
 let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With Love'), (3, 'Goldfinger'), (4, 'Thunderball'), (5, 'You Only Live Twice')";
 --exec $MYSQL_SLAP --silent --concurrency=5 --iterations=200 --query=$query --delimiter=";"
 

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-07-06 17:14:41 +0000
+++ b/mysql-test/t/disabled.def	2008-07-08 10:56:05 +0000
@@ -96,3 +96,13 @@ transaction_alloc_block_size_basic_64 : 
 transaction_prealloc_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
 wait_timeout_basic_64                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
 wait_timeout_func                     : BUG#36873 2008-07-06 sven wait_timeout_func.test fails randomly
+delayed_insert_limit_func             : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+event_scheduler_func                  : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+innodb_max_dirty_pages_pct_func       : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+interactive_timeout_func              : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+query_cache_wlock_invalidate_func     : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+rpl_init_slave_func                   : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+rpl_max_binlog_size_func              : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+slow_query_log_func                   : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+sql_low_priority_updates_func         : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+timestamp_func                        : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions