diff --git a/mysql-test/r/rpl_ndb_stm_innodb.result b/mysql-test/r/rpl_ndb_stm_innodb.result
index 624439754b2..9ed54a11c1c 100644
--- a/mysql-test/r/rpl_ndb_stm_innodb.result
+++ b/mysql-test/r/rpl_ndb_stm_innodb.result
@@ -8,9 +8,6 @@ create table t1 (a int key, b int) engine innodb;
 create table t2 (a int key, b int) engine innodb;
 alter table t1 engine ndb;
 alter table t2 engine ndb;
-STOP SLAVE;
-SET GLOBAL BINLOG_FORMAT=MIXED;
-START SLAVE;
 insert into t1 values (1,2);
 select @start_pos:=start_pos, @end_pos:=end_pos from mysql.ndb_apply_status;
 @start_pos:=start_pos	@end_pos:=end_pos
diff --git a/mysql-test/t/binlog_multi_engine.test b/mysql-test/t/binlog_multi_engine.test
index fa303281cc2..b363a5fc0bf 100644
--- a/mysql-test/t/binlog_multi_engine.test
+++ b/mysql-test/t/binlog_multi_engine.test
@@ -5,7 +5,6 @@
 
 source include/have_blackhole.inc;
 source include/have_ndb.inc;
-source include/have_binlog_format_mixed_or_row.inc;
 
 CREATE TABLE t1m (m INT, n INT) ENGINE=MYISAM;
 CREATE TABLE t1b (b INT, c INT) ENGINE=BLACKHOLE;
diff --git a/mysql-test/t/loaddata_autocom_ndb.test b/mysql-test/t/loaddata_autocom_ndb.test
index a6a3aec2c4e..f4a6743aabe 100644
--- a/mysql-test/t/loaddata_autocom_ndb.test
+++ b/mysql-test/t/loaddata_autocom_ndb.test
@@ -1,5 +1,4 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_mixed_or_row.inc
 let $engine_type=ndbcluster;
 
 --source include/loaddata_autocom.inc
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test
index d85e4900337..a7b52d54710 100644
--- a/mysql-test/t/ndb_alter_table.test
+++ b/mysql-test/t/ndb_alter_table.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_alter_table2.test b/mysql-test/t/ndb_alter_table2.test
index 654453cc4cf..afe6e44f698 100644
--- a/mysql-test/t/ndb_alter_table2.test
+++ b/mysql-test/t/ndb_alter_table2.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_alter_table3.test b/mysql-test/t/ndb_alter_table3.test
index 2f8f9ebcf89..a5fe613adcf 100644
--- a/mysql-test/t/ndb_alter_table3.test
+++ b/mysql-test/t/ndb_alter_table3.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test
index 6e70b8f5979..06d47693c10 100644
--- a/mysql-test/t/ndb_autodiscover.test
+++ b/mysql-test/t/ndb_autodiscover.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_autodiscover2.test b/mysql-test/t/ndb_autodiscover2.test
index 360ce7195a8..ebe14696cd2 100644
--- a/mysql-test/t/ndb_autodiscover2.test
+++ b/mysql-test/t/ndb_autodiscover2.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 #
diff --git a/mysql-test/t/ndb_autodiscover3.test b/mysql-test/t/ndb_autodiscover3.test
index 36ee191c065..d0b9d0983e9 100644
--- a/mysql-test/t/ndb_autodiscover3.test
+++ b/mysql-test/t/ndb_autodiscover3.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 8ef231599fa..b9ccdf9fd0d 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_binlog_log_bin.test b/mysql-test/t/ndb_binlog_log_bin.test
index 63b84134824..b2dbaa797b6 100644
--- a/mysql-test/t/ndb_binlog_log_bin.test
+++ b/mysql-test/t/ndb_binlog_log_bin.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 
diff --git a/mysql-test/t/ndb_binlog_multi.test b/mysql-test/t/ndb_binlog_multi.test
index 4256b0bf993..c227c7fec93 100644
--- a/mysql-test/t/ndb_binlog_multi.test
+++ b/mysql-test/t/ndb_binlog_multi.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 
diff --git a/mysql-test/t/ndb_bitfield.test b/mysql-test/t/ndb_bitfield.test
index c8454f38cca..de0ae23bfe6 100644
--- a/mysql-test/t/ndb_bitfield.test
+++ b/mysql-test/t/ndb_bitfield.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/t/ndb_blob.test
index b565de74c26..b9a8c7e20ee 100644
--- a/mysql-test/t/ndb_blob.test
+++ b/mysql-test/t/ndb_blob.test
@@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_blob_partition.test b/mysql-test/t/ndb_blob_partition.test
index 13ad2ecc7c3..35df57b96ba 100644
--- a/mysql-test/t/ndb_blob_partition.test
+++ b/mysql-test/t/ndb_blob_partition.test
@@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_query_log
diff --git a/mysql-test/t/ndb_cache.test b/mysql-test/t/ndb_cache.test
index d8cb8b01e86..9c299b61c24 100644
--- a/mysql-test/t/ndb_cache.test
+++ b/mysql-test/t/ndb_cache.test
@@ -1,5 +1,4 @@
 -- source include/have_query_cache.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_cache2.test b/mysql-test/t/ndb_cache2.test
index 27d39b09cf6..352b01ef73f 100644
--- a/mysql-test/t/ndb_cache2.test
+++ b/mysql-test/t/ndb_cache2.test
@@ -1,5 +1,4 @@
 -- source include/have_query_cache.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_cache_multi.test b/mysql-test/t/ndb_cache_multi.test
index a7095139285..404393c211e 100644
--- a/mysql-test/t/ndb_cache_multi.test
+++ b/mysql-test/t/ndb_cache_multi.test
@@ -1,5 +1,4 @@
 -- source include/have_query_cache.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
diff --git a/mysql-test/t/ndb_cache_multi2.test b/mysql-test/t/ndb_cache_multi2.test
index 40cc41f1c97..2afcf0c18f7 100644
--- a/mysql-test/t/ndb_cache_multi2.test
+++ b/mysql-test/t/ndb_cache_multi2.test
@@ -1,5 +1,4 @@
 -- source include/have_query_cache.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
diff --git a/mysql-test/t/ndb_charset.test b/mysql-test/t/ndb_charset.test
index b36b70be94c..2d9f66564bc 100644
--- a/mysql-test/t/ndb_charset.test
+++ b/mysql-test/t/ndb_charset.test
@@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_condition_pushdown.test b/mysql-test/t/ndb_condition_pushdown.test
index 9df494aa3ab..ab56430ac1d 100644
--- a/mysql-test/t/ndb_condition_pushdown.test
+++ b/mysql-test/t/ndb_condition_pushdown.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_config.test b/mysql-test/t/ndb_config.test
index eb52bd249d6..f63c0087c1e 100644
--- a/mysql-test/t/ndb_config.test
+++ b/mysql-test/t/ndb_config.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_config2.test b/mysql-test/t/ndb_config2.test
index 20946b53552..170f1b2e5e7 100644
--- a/mysql-test/t/ndb_config2.test
+++ b/mysql-test/t/ndb_config2.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_cursor.test b/mysql-test/t/ndb_cursor.test
index 1ef745a13f7..406f8629cfe 100644
--- a/mysql-test/t/ndb_cursor.test
+++ b/mysql-test/t/ndb_cursor.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_database.test b/mysql-test/t/ndb_database.test
index 409ac33502a..8bfdf40de88 100644
--- a/mysql-test/t/ndb_database.test
+++ b/mysql-test/t/ndb_database.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_dd_alter.test b/mysql-test/t/ndb_dd_alter.test
index ee58968247f..7635a8944da 100644
--- a/mysql-test/t/ndb_dd_alter.test
+++ b/mysql-test/t/ndb_dd_alter.test
@@ -40,7 +40,6 @@
 ##############################################################
 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_innodb.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_dd_backuprestore.test b/mysql-test/t/ndb_dd_backuprestore.test
index 156ff88718e..48db8ec3e0b 100644
--- a/mysql-test/t/ndb_dd_backuprestore.test
+++ b/mysql-test/t/ndb_dd_backuprestore.test
@@ -5,7 +5,6 @@
 ########################################
 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_dd_basic.test b/mysql-test/t/ndb_dd_basic.test
index d20ffc6e4bd..3acf4669868 100644
--- a/mysql-test/t/ndb_dd_basic.test
+++ b/mysql-test/t/ndb_dd_basic.test
@@ -13,7 +13,6 @@
 #################################
 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/t/ndb_dd_ddl.test b/mysql-test/t/ndb_dd_ddl.test
index 10229e4c0c2..aa692385b07 100644
--- a/mysql-test/t/ndb_dd_ddl.test
+++ b/mysql-test/t/ndb_dd_ddl.test
@@ -27,7 +27,6 @@
 
 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/t/ndb_dd_disk2memory.test b/mysql-test/t/ndb_dd_disk2memory.test
index 760a1377bdf..5975f44e087 100644
--- a/mysql-test/t/ndb_dd_disk2memory.test
+++ b/mysql-test/t/ndb_dd_disk2memory.test
@@ -6,7 +6,6 @@
 ########################################
 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS test.t1;
diff --git a/mysql-test/t/ndb_dd_dump.test b/mysql-test/t/ndb_dd_dump.test
index 54128d075ca..38ceafb7d80 100644
--- a/mysql-test/t/ndb_dd_dump.test
+++ b/mysql-test/t/ndb_dd_dump.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2, t3;
diff --git a/mysql-test/t/ndb_dd_sql_features.test b/mysql-test/t/ndb_dd_sql_features.test
index ae8f6a7b9e7..f46cb217ab4 100644
--- a/mysql-test/t/ndb_dd_sql_features.test
+++ b/mysql-test/t/ndb_dd_sql_features.test
@@ -26,7 +26,6 @@
 #         gives a better idea of what the test is about
 ########################################################### 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS test.t1;
diff --git a/mysql-test/t/ndb_gis.test b/mysql-test/t/ndb_gis.test
index 104fdf41734..e14f462c32d 100644
--- a/mysql-test/t/ndb_gis.test
+++ b/mysql-test/t/ndb_gis.test
@@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 SET storage_engine=ndbcluster;
 --source include/gis_generic.inc
 set engine_condition_pushdown = on;
diff --git a/mysql-test/t/ndb_index.test b/mysql-test/t/ndb_index.test
index fc284407973..272f30e3e6f 100644
--- a/mysql-test/t/ndb_index.test
+++ b/mysql-test/t/ndb_index.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/t/ndb_index_ordered.test
index 95b64eeef21..782f17ca5b2 100644
--- a/mysql-test/t/ndb_index_ordered.test
+++ b/mysql-test/t/ndb_index_ordered.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_index_unique.test b/mysql-test/t/ndb_index_unique.test
index ecd4077bb56..78757c3bcf7 100644
--- a/mysql-test/t/ndb_index_unique.test
+++ b/mysql-test/t/ndb_index_unique.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_insert.test b/mysql-test/t/ndb_insert.test
index 4b347e1a1ad..5b74cc9202c 100644
--- a/mysql-test/t/ndb_insert.test
+++ b/mysql-test/t/ndb_insert.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_limit.test b/mysql-test/t/ndb_limit.test
index b0d189ff5d9..01613606d66 100644
--- a/mysql-test/t/ndb_limit.test
+++ b/mysql-test/t/ndb_limit.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_loaddatalocal.test b/mysql-test/t/ndb_loaddatalocal.test
index 7453ae1bd64..3eae3891f43 100644
--- a/mysql-test/t/ndb_loaddatalocal.test
+++ b/mysql-test/t/ndb_loaddatalocal.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/t/ndb_lock.test
index e677cba8e59..b6cd1ca7eb4 100644
--- a/mysql-test/t/ndb_lock.test
+++ b/mysql-test/t/ndb_lock.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 connect (con1,localhost,root,,);
diff --git a/mysql-test/t/ndb_minmax.test b/mysql-test/t/ndb_minmax.test
index 4d9f132194a..a3ac677cd2a 100644
--- a/mysql-test/t/ndb_minmax.test
+++ b/mysql-test/t/ndb_minmax.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test
index 3e25227ae80..3482db1d1b2 100644
--- a/mysql-test/t/ndb_multi.test
+++ b/mysql-test/t/ndb_multi.test
@@ -1,6 +1,5 @@
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_partition_error.test b/mysql-test/t/ndb_partition_error.test
index ce25dfc0fd5..9db2a6a6f6d 100644
--- a/mysql-test/t/ndb_partition_error.test
+++ b/mysql-test/t/ndb_partition_error.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 #--disable_abort_on_error
 #
 # Simple test for the partition storage engine
diff --git a/mysql-test/t/ndb_partition_key.test b/mysql-test/t/ndb_partition_key.test
index 4760022d20f..78e2c9d15c2 100644
--- a/mysql-test/t/ndb_partition_key.test
+++ b/mysql-test/t/ndb_partition_key.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/t/ndb_partition_list.test b/mysql-test/t/ndb_partition_list.test
index 35c7104ff92..ccfcdbc84f4 100644
--- a/mysql-test/t/ndb_partition_list.test
+++ b/mysql-test/t/ndb_partition_list.test
@@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 #
 # Simple test for the partition storage engine
 # Focuses on range partitioning tests
diff --git a/mysql-test/t/ndb_partition_range.test b/mysql-test/t/ndb_partition_range.test
index e34cb92771c..7952ba502d2 100644
--- a/mysql-test/t/ndb_partition_range.test
+++ b/mysql-test/t/ndb_partition_range.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 #--disable_abort_on_error
 #
 # Simple test for the partition storage engine
diff --git a/mysql-test/t/ndb_read_multi_range.test b/mysql-test/t/ndb_read_multi_range.test
index b5b46958065..ecca1f9862c 100644
--- a/mysql-test/t/ndb_read_multi_range.test
+++ b/mysql-test/t/ndb_read_multi_range.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_rename.test b/mysql-test/t/ndb_rename.test
index 1b2f6d72119..7f9fd0e6984 100644
--- a/mysql-test/t/ndb_rename.test
+++ b/mysql-test/t/ndb_rename.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_replace.test b/mysql-test/t/ndb_replace.test
index cb5f1cc46cb..aa2072b98dd 100644
--- a/mysql-test/t/ndb_replace.test
+++ b/mysql-test/t/ndb_replace.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 #
diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test
index 2414e6b7268..7f0cafdfd77 100644
--- a/mysql-test/t/ndb_restore.test
+++ b/mysql-test/t/ndb_restore.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_restore_partition.test b/mysql-test/t/ndb_restore_partition.test
index 0cddc38a876..f11324492c2 100644
--- a/mysql-test/t/ndb_restore_partition.test
+++ b/mysql-test/t/ndb_restore_partition.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_restore_print.test b/mysql-test/t/ndb_restore_print.test
index d198623886b..6dbbfdf5933 100644
--- a/mysql-test/t/ndb_restore_print.test
+++ b/mysql-test/t/ndb_restore_print.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/ndb_row_format.test b/mysql-test/t/ndb_row_format.test
index 49d771e4017..b1582cbe339 100644
--- a/mysql-test/t/ndb_row_format.test
+++ b/mysql-test/t/ndb_row_format.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_single_user.test b/mysql-test/t/ndb_single_user.test
index 5d2ee0a3a8d..3c6656be9f9 100644
--- a/mysql-test/t/ndb_single_user.test
+++ b/mysql-test/t/ndb_single_user.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
diff --git a/mysql-test/t/ndb_sp.test b/mysql-test/t/ndb_sp.test
index 703cb116c52..b833869cad0 100644
--- a/mysql-test/t/ndb_sp.test
+++ b/mysql-test/t/ndb_sp.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_subquery.test b/mysql-test/t/ndb_subquery.test
index c8aec569de9..6282c31c922 100644
--- a/mysql-test/t/ndb_subquery.test
+++ b/mysql-test/t/ndb_subquery.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_temporary.test b/mysql-test/t/ndb_temporary.test
index 3a9e7c94398..7f6902bf745 100644
--- a/mysql-test/t/ndb_temporary.test
+++ b/mysql-test/t/ndb_temporary.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_transaction.test b/mysql-test/t/ndb_transaction.test
index dca1fde8fc7..d3ebadb1a78 100644
--- a/mysql-test/t/ndb_transaction.test
+++ b/mysql-test/t/ndb_transaction.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_trigger.test b/mysql-test/t/ndb_trigger.test
index e6d91c05313..2e944174fd0 100644
--- a/mysql-test/t/ndb_trigger.test
+++ b/mysql-test/t/ndb_trigger.test
@@ -1,6 +1,5 @@
 # Tests which involve triggers and NDB storage engine
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
 --source include/not_embedded.inc
 
 # 
diff --git a/mysql-test/t/ndb_truncate.test b/mysql-test/t/ndb_truncate.test
index a62fd43408d..a1ef4be0d48 100644
--- a/mysql-test/t/ndb_truncate.test
+++ b/mysql-test/t/ndb_truncate.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_types.test b/mysql-test/t/ndb_types.test
index 9b395c12bf8..ab18817132e 100644
--- a/mysql-test/t/ndb_types.test
+++ b/mysql-test/t/ndb_types.test
@@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 --source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_update.test b/mysql-test/t/ndb_update.test
index a864aa28dc3..73a0ebc69cb 100644
--- a/mysql-test/t/ndb_update.test
+++ b/mysql-test/t/ndb_update.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndb_view.test b/mysql-test/t/ndb_view.test
index 4f2580ef15e..3b8fc330b40 100644
--- a/mysql-test/t/ndb_view.test
+++ b/mysql-test/t/ndb_view.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ndbapi.test b/mysql-test/t/ndbapi.test
index d58ed1c5ccd..3424513f8af 100644
--- a/mysql-test/t/ndbapi.test
+++ b/mysql-test/t/ndbapi.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndbapi_examples.inc
 
 --disable_warnings
diff --git a/mysql-test/t/ps_7ndb.test b/mysql-test/t/ps_7ndb.test
index eb98a815d74..e3f65ec2c4e 100644
--- a/mysql-test/t/ps_7ndb.test
+++ b/mysql-test/t/ps_7ndb.test
@@ -11,7 +11,6 @@
 use test;
 
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 let $type= 'NDB' ;
 -- source include/ps_create.inc
 -- source include/ps_renew.inc
diff --git a/mysql-test/t/rpl_ndb_commit_afterflush.test b/mysql-test/t/rpl_ndb_commit_afterflush.test
index 5bbd7f0414e..8c45ac5dbdd 100644
--- a/mysql-test/t/rpl_ndb_commit_afterflush.test
+++ b/mysql-test/t/rpl_ndb_commit_afterflush.test
@@ -5,7 +5,6 @@
 # By JBM 2004-02-15                 #
 #####################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_commit_after_flush.test
diff --git a/mysql-test/t/rpl_ndb_innodb_trans.test b/mysql-test/t/rpl_ndb_innodb_trans.test
index efba6050554..2f2414ba578 100644
--- a/mysql-test/t/rpl_ndb_innodb_trans.test
+++ b/mysql-test/t/rpl_ndb_innodb_trans.test
@@ -2,7 +2,6 @@
 
 -- source include/have_ndb.inc
 -- source include/have_innodb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_master-slave.inc
 
 create table t1 (a int, unique(a)) engine=ndbcluster;
diff --git a/mysql-test/t/rpl_ndb_stm_innodb.test b/mysql-test/t/rpl_ndb_stm_innodb.test
index d43fafa8406..d772a3372b9 100644
--- a/mysql-test/t/rpl_ndb_stm_innodb.test
+++ b/mysql-test/t/rpl_ndb_stm_innodb.test
@@ -12,14 +12,6 @@ create table t2 (a int key, b int) engine innodb;
 alter table t1 engine ndb;
 alter table t2 engine ndb;
 
-# We need MIXED mode on the slave in the event that there are
-# statements coming in from the master.  In this case, NDB can only
-# handle row-based format, so it has to be possible to switch to
-# this.
-STOP SLAVE;
-SET GLOBAL BINLOG_FORMAT=MIXED;
-START SLAVE;
-
 # check binlog position without begin
 --connection master
 insert into t1 values (1,2);
diff --git a/mysql-test/t/strict_autoinc_5ndb.test b/mysql-test/t/strict_autoinc_5ndb.test
index 819d0068148..9e2090fddef 100644
--- a/mysql-test/t/strict_autoinc_5ndb.test
+++ b/mysql-test/t/strict_autoinc_5ndb.test
@@ -1,5 +1,4 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 #
 # Bug#20573 Strict mode auto-increment