WL#3303

- row based ndb logging also in mixed

mysql-test/t/ndb_autodiscover3.test

@@ -3,7 +3,7 @@
 -- source include/not_embedded.inc
 
 # see bug#21563
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 drop table if exists t1, t2;

mysql-test/t/ndb_binlog_basic.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 drop table if exists t1, t2;

mysql-test/t/ndb_binlog_ddl_multi.test

 -- source include/have_multi_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 connection server2;

mysql-test/t/ndb_binlog_discover.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 drop table if exists t1;

mysql-test/t/ndb_binlog_ignore_db.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 reset master;
 
 --disable_warnings

mysql-test/t/ndb_binlog_log_bin.test

 -- source include/have_multi_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 connection server2;

mysql-test/t/ndb_binlog_multi.test

 -- source include/have_multi_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 connection server2;

mysql-test/t/ndb_multi_row.test

 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 
 --disable_warnings

mysql-test/t/rpl_ndb_UUID.test

@@ -2,7 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_row_UUID.test

mysql-test/t/rpl_ndb_bank.test

@@ -12,7 +12,7 @@
  
 --source include/have_ndb.inc
 --source include/have_ndb_extra.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 # kill any trailing processes

mysql-test/t/rpl_ndb_basic.test

 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 

mysql-test/t/rpl_ndb_blob.test

 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 #

mysql-test/t/rpl_ndb_blob2.test

@@ -4,7 +4,7 @@
 # code between engine tests     #
 #################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_blob.test

mysql-test/t/rpl_ndb_circular.test

 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 # set up circular replication

mysql-test/t/rpl_ndb_circular_simplex.test

 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 connection master;

mysql-test/t/rpl_ndb_dd_advance.test

@@ -6,7 +6,7 @@
 
 #### Include Section ####
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
 #--source include/big_test.inc

mysql-test/t/rpl_ndb_dd_basic.test

 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings

mysql-test/t/rpl_ndb_dd_partitions.test

@@ -6,7 +6,7 @@
 #######################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --echo --- Doing pre test cleanup --- 

mysql-test/t/rpl_ndb_ddl.test

@@ -24,7 +24,7 @@
 #
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 let $engine_type= NDB;
 let $temp_engine_type= MEMORY;

mysql-test/t/rpl_ndb_delete_nowhere.test

@@ -3,7 +3,7 @@
 # Share test code between engine tests  #
 #########################################
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_delete_no_where.test

mysql-test/t/rpl_ndb_do_db.test

@@ -6,7 +6,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings

mysql-test/t/rpl_ndb_do_table.test

@@ -6,7 +6,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings

mysql-test/t/rpl_ndb_extraCol.test

@@ -4,7 +4,7 @@
 # Purpose: Wapper for rpl_extraSlave_Col.test
 #          Using NDB
 ########################################### 
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndb.inc
 -- source include/ndb_master-slave.inc
 let $engine_type = 'NDB';

mysql-test/t/rpl_ndb_func003.test

@@ -7,7 +7,7 @@
 # reduce test case code           #
 ###################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_func003.test

mysql-test/t/rpl_ndb_idempotent.test

 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 #

mysql-test/t/rpl_ndb_insert_ignore.test

@@ -2,7 +2,7 @@
 # Wrapper for rpl_insert_ignore.test#
 #####################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 let $engine_type2=myisam;

mysql-test/t/rpl_ndb_multi.test

 --source include/have_multi_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 # note: server2 is another "master" connected to the master cluster

mysql-test/t/rpl_ndb_multi_update2.test

@@ -6,7 +6,7 @@
 
 # Run this only for row based replication, as replication of
 # auto_increment values are not supported with NDB as storage engine
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 
 let $engine_type=NDB;

mysql-test/t/rpl_ndb_multi_update3.test

@@ -3,7 +3,7 @@
 # to reuse test code between engine runs                   #
 ############################################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_multi_update3.test

mysql-test/t/rpl_ndb_rep_ignore.test

@@ -7,7 +7,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings

mysql-test/t/rpl_ndb_row_001.test

@@ -2,7 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_001.test

mysql-test/t/rpl_ndb_sp003.test

@@ -5,7 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp003.test

mysql-test/t/rpl_ndb_sp006.test

@@ -5,7 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp006.test

mysql-test/t/rpl_ndb_sync.test

 --source include/have_ndb.inc
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 #

mysql-test/t/rpl_ndb_trig004.test

@@ -7,7 +7,7 @@
 #############################################################################
 
 # Includes
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndb.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;

mysql-test/t/rpl_ndbapi_multi.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndbapi_examples.inc
 -- source include/ndb_master-slave.inc
 

mysql-test/t/rpl_row_basic_7ndb.test

 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 
 let $type= 'NDB' ;