WL#3303

- undoing disable of ndb tests
2025-01-18 13:02:28 +01:00 · 2007-06-27 13:32:25 +02:00 · 2007-06-27 13:32:25 +02:00 · bd4ac4b335
commit bd4ac4b335
parent 4554e876b6
69 changed files with 0 additions and 78 deletions
--- 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
--- 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;
--- 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
--- 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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