bk commit into 5.1 tree (jonas:1.2277)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-22 09:48:15+02:00, jonas@stripped +5 -0
  ndb -
    reenable some test after adding sync_with_master to end of test
      to make sure that binlog has been applied to slave before end of test

  mysql-test/t/disabled.def@stripped, 2006-08-22 09:48:12+02:00, jonas@stripped +3 -3
    reenable test after adding extra sync_with_master

  mysql-test/t/rpl_ndb_func003.test@stripped, 2006-08-22 09:48:12+02:00, jonas@stripped +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

  mysql-test/t/rpl_ndb_idempotent.test@stripped, 2006-08-22 09:48:12+02:00, jonas@stripped +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

  mysql-test/t/rpl_row_basic_7ndb.test@stripped, 2006-08-22 09:48:12+02:00, jonas@stripped +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

  mysql-test/t/rpl_truncate_7ndb.test@stripped, 2006-08-22 09:48:13+02:00, jonas@stripped +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.1/mysql-test/t/rpl_ndb_func003.test	2006-08-22 09:48:20 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_func003.test	2006-08-22 09:48:20 +02:00
@@ -9,3 +9,4 @@
 -- source include/have_ndb.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_func003.test
+-- source include/master-slave-end.inc

--- 1.185/mysql-test/t/disabled.def	2006-08-22 09:48:20 +02:00
+++ 1.186/mysql-test/t/disabled.def	2006-08-22 09:48:20 +02:00
@@ -38,8 +38,8 @@
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
-rpl_ndb_idempotent       : BUG#21298 2006-07-27 msvensson
-rpl_row_basic_7ndb       : BUG#21298 2006-07-27 msvensson
-rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
+#rpl_ndb_idempotent       : BUG#21298 2006-07-27 msvensson
+#rpl_row_basic_7ndb       : BUG#21298 2006-07-27 msvensson
+#rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 crash_commit_before      : 2006-08-02 msvensson
 rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)

--- 1.5/mysql-test/t/rpl_truncate_7ndb.test	2006-08-22 09:48:20 +02:00
+++ 1.6/mysql-test/t/rpl_truncate_7ndb.test	2006-08-22 09:48:20 +02:00
@@ -67,3 +67,4 @@
 --replace_result $SERVER_VERSION SERVER_VERSION
 SHOW BINLOG EVENTS;
 
+-- source include/master-slave-end.inc

--- 1.3/mysql-test/t/rpl_ndb_idempotent.test	2006-08-22 09:48:20 +02:00
+++ 1.4/mysql-test/t/rpl_ndb_idempotent.test	2006-08-22 09:48:20 +02:00
@@ -114,3 +114,4 @@
 DROP TABLE IF EXISTS t1;
 
 # End of 5.1 Test
+-- source include/master-slave-end.inc

--- 1.1/mysql-test/t/rpl_row_basic_7ndb.test	2006-08-22 09:48:20 +02:00
+++ 1.2/mysql-test/t/rpl_row_basic_7ndb.test	2006-08-22 09:48:20 +02:00
@@ -2,3 +2,4 @@
 let $type= 'NDB' ;
 let $extra_index= ;
 -- source include/rpl_row_basic.inc
+-- source include/master-slave-end.inc