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:
  reenable test after adding extra sync_with_master
mysql-test/t/rpl_ndb_func003.test:
  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:
  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:
  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:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test

mysql-test/t/disabled.def

@@ -38,8 +38,8 @@ rpl_sp_effects           : BUG#19862 2006-06-15 mkindahl
 
 # 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)

mysql-test/t/rpl_ndb_func003.test

@@ -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

mysql-test/t/rpl_ndb_idempotent.test

@@ -114,3 +114,4 @@ connection master;
 DROP TABLE IF EXISTS t1;
 
 # End of 5.1 Test
+-- source include/master-slave-end.inc

mysql-test/t/rpl_row_basic_7ndb.test

@@ -2,3 +2,4 @@
 let $type= 'NDB' ;
 let $extra_index= ;
 -- source include/rpl_row_basic.inc
+-- source include/master-slave-end.inc

mysql-test/t/rpl_truncate_7ndb.test

@@ -67,3 +67,4 @@ DROP TABLE t1;
 --replace_result $SERVER_VERSION SERVER_VERSION
 SHOW BINLOG EVENTS;
 
+-- source include/master-slave-end.inc