WL#3303

- undoing disable of ndb tests

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

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;

mysql-test/t/loaddata_autocom_ndb.test

 --source include/have_ndb.inc
---source include/have_binlog_format_mixed_or_row.inc
 let $engine_type=ndbcluster;
 
 --source include/loaddata_autocom.inc

mysql-test/t/ndb_alter_table.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_alter_table2.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_alter_table3.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_autodiscover.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_autodiscover2.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 #

mysql-test/t/ndb_autodiscover3.test

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

mysql-test/t/ndb_basic.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_binlog_log_bin.test

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

mysql-test/t/ndb_binlog_multi.test

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

mysql-test/t/ndb_bitfield.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_blob.test

 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_blob_partition.test

 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_query_log

mysql-test/t/ndb_cache.test

 -- source include/have_query_cache.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_cache2.test

 -- source include/have_query_cache.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_cache_multi.test

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

mysql-test/t/ndb_cache_multi2.test

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

mysql-test/t/ndb_charset.test

 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_condition_pushdown.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_config.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_config2.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_cursor.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_database.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

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
 

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
 

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;

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;

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;

mysql-test/t/ndb_dd_dump.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2, t3;

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;

mysql-test/t/ndb_gis.test

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

mysql-test/t/ndb_index.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_index_ordered.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_index_unique.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_insert.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_limit.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_loaddatalocal.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_lock.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 connect (con1,localhost,root,,);

mysql-test/t/ndb_minmax.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_multi.test

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

mysql-test/t/ndb_partition_error.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 #--disable_abort_on_error
 #
 # Simple test for the partition storage engine

mysql-test/t/ndb_partition_key.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;

mysql-test/t/ndb_partition_list.test

 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 #
 # Simple test for the partition storage engine
 # Focuses on range partitioning tests

mysql-test/t/ndb_partition_range.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 #--disable_abort_on_error
 #
 # Simple test for the partition storage engine

mysql-test/t/ndb_read_multi_range.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_rename.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_replace.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 #

mysql-test/t/ndb_restore.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_restore_partition.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_restore_print.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_row_format.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_single_user.test

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

mysql-test/t/ndb_sp.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_subquery.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_temporary.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_transaction.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_trigger.test

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

mysql-test/t/ndb_truncate.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_types.test

 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 --source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_update.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndb_view.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

mysql-test/t/ndbapi.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 -- source include/have_ndbapi_examples.inc
 
 --disable_warnings

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

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

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;

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);

mysql-test/t/strict_autoinc_5ndb.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
 
 #
 # Bug#20573 Strict mode auto-increment