Skip to content

M
MariaDB
Commit 52fd5447 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files
Options

WL#3303 

- row based ndb logging also in mixed
parent b34b8e36
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
mysql-test/t/ndb_autodiscover3.test
View file @ 52fd5447
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
-- source include/not_embedded.inc -- source include/not_embedded.inc
# see bug#21563 # see bug#21563
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
--disable_warnings --disable_warnings
drop table if exists t1, t2; drop table if exists t1, t2;
......
mysql-test/t/ndb_binlog_basic.test
View file @ 52fd5447
-- source include/have_ndb.inc -- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
--disable_warnings --disable_warnings
drop table if exists t1, t2; drop table if exists t1, t2;
......
mysql-test/t/ndb_binlog_ddl_multi.test
View file @ 52fd5447
-- source include/have_multi_ndb.inc -- source include/have_multi_ndb.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
--disable_warnings --disable_warnings
connection server2; connection server2;
......
mysql-test/t/ndb_binlog_discover.test
View file @ 52fd5447
-- source include/have_ndb.inc -- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
......
mysql-test/t/ndb_binlog_ignore_db.test
View file @ 52fd5447
-- source include/have_ndb.inc -- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
reset master; reset master;
--disable_warnings --disable_warnings
......
mysql-test/t/ndb_binlog_log_bin.test
View file @ 52fd5447
-- source include/have_multi_ndb.inc -- source include/have_multi_ndb.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
--disable_warnings --disable_warnings
connection server2; connection server2;
......
mysql-test/t/ndb_binlog_multi.test
View file @ 52fd5447
-- source include/have_multi_ndb.inc -- source include/have_multi_ndb.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
--disable_warnings --disable_warnings
connection server2; connection server2;
......
mysql-test/t/ndb_multi_row.test
View file @ 52fd5447
-- source include/have_ndb.inc -- source include/have_ndb.inc
-- source include/have_multi_ndb.inc -- source include/have_multi_ndb.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
--disable_warnings --disable_warnings
......
mysql-test/t/rpl_ndb_UUID.test
View file @ 52fd5447
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# By JBM 2005-02-15 Wrapped to allow reuse of test code# # By JBM 2005-02-15 Wrapped to allow reuse of test code#
######################################################## ########################################################
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
--source extra/rpl_tests/rpl_row_UUID.test --source extra/rpl_tests/rpl_row_UUID.test
mysql-test/t/rpl_ndb_bank.test
View file @ 52fd5447
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
--source include/have_ndb.inc --source include/have_ndb.inc
--source include/have_ndb_extra.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 --source include/ndb_master-slave.inc
# kill any trailing processes # kill any trailing processes
......
mysql-test/t/rpl_ndb_basic.test
View file @ 52fd5447
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
......
mysql-test/t/rpl_ndb_blob.test
View file @ 52fd5447
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
# #
......
mysql-test/t/rpl_ndb_blob2.test
View file @ 52fd5447
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# code between engine tests # # code between engine tests #
################################# #################################
-- source include/have_ndb.inc -- 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 -- source include/ndb_master-slave.inc
let $engine_type=NDBCLUSTER; let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_blob.test -- source extra/rpl_tests/rpl_row_blob.test
......
mysql-test/t/rpl_ndb_circular.test
View file @ 52fd5447
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
# set up circular replication # set up circular replication
......
mysql-test/t/rpl_ndb_circular_simplex.test
View file @ 52fd5447
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
connection master; connection master;
......
mysql-test/t/rpl_ndb_dd_advance.test
View file @ 52fd5447
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#### Include Section #### #### Include Section ####
--source include/have_ndb.inc --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/ndb_default_cluster.inc
--source include/not_embedded.inc --source include/not_embedded.inc
#--source include/big_test.inc #--source include/big_test.inc
......
mysql-test/t/rpl_ndb_dd_basic.test
View file @ 52fd5447
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
--disable_warnings --disable_warnings
......
mysql-test/t/rpl_ndb_dd_partitions.test
View file @ 52fd5447
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
####################################### #######################################
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
--echo --- Doing pre test cleanup --- --echo --- Doing pre test cleanup ---
......
mysql-test/t/rpl_ndb_ddl.test
View file @ 52fd5447
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# #
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
let $engine_type= NDB; let $engine_type= NDB;
let $temp_engine_type= MEMORY; let $temp_engine_type= MEMORY;
......
mysql-test/t/rpl_ndb_delete_nowhere.test
View file @ 52fd5447
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Share test code between engine tests # # Share test code between engine tests #
######################################### #########################################
--source include/have_ndb.inc --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 -- source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
-- source extra/rpl_tests/rpl_delete_no_where.test -- source extra/rpl_tests/rpl_delete_no_where.test
mysql-test/t/rpl_ndb_do_db.test
View file @ 52fd5447
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
########################################################## ##########################################################
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
--disable_warnings --disable_warnings
......
mysql-test/t/rpl_ndb_do_table.test
View file @ 52fd5447
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
########################################################## ##########################################################
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
--disable_warnings --disable_warnings
......
mysql-test/t/rpl_ndb_extraCol.test
View file @ 52fd5447
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Purpose: Wapper for rpl_extraSlave_Col.test # Purpose: Wapper for rpl_extraSlave_Col.test
# Using NDB # 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/have_ndb.inc
-- source include/ndb_master-slave.inc -- source include/ndb_master-slave.inc
let $engine_type = 'NDB'; let $engine_type = 'NDB';
......
mysql-test/t/rpl_ndb_func003.test
View file @ 52fd5447
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# reduce test case code # # reduce test case code #
################################### ###################################
-- source include/have_ndb.inc -- 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 -- source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
-- source extra/rpl_tests/rpl_row_func003.test -- source extra/rpl_tests/rpl_row_func003.test
......
mysql-test/t/rpl_ndb_idempotent.test
View file @ 52fd5447
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
# #
......
mysql-test/t/rpl_ndb_insert_ignore.test
View file @ 52fd5447
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Wrapper for rpl_insert_ignore.test# # Wrapper for rpl_insert_ignore.test#
##################################### #####################################
-- source include/have_ndb.inc -- 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 -- source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
let $engine_type2=myisam; let $engine_type2=myisam;
......
mysql-test/t/rpl_ndb_multi.test
View file @ 52fd5447
--source include/have_multi_ndb.inc --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 --source include/ndb_master-slave.inc
# note: server2 is another "master" connected to the master cluster # note: server2 is another "master" connected to the master cluster
......
mysql-test/t/rpl_ndb_multi_update2.test
View file @ 52fd5447
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# Run this only for row based replication, as replication of # Run this only for row based replication, as replication of
# auto_increment values are not supported with NDB as storage engine # 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 -- source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
......
mysql-test/t/rpl_ndb_multi_update3.test
View file @ 52fd5447
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# to reuse test code between engine runs # # to reuse test code between engine runs #
############################################################ ############################################################
-- source include/have_ndb.inc -- 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 -- source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
-- source extra/rpl_tests/rpl_multi_update3.test -- source extra/rpl_tests/rpl_multi_update3.test
mysql-test/t/rpl_ndb_rep_ignore.test
View file @ 52fd5447
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
########################################################## ##########################################################
--source include/have_ndb.inc --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 --source include/ndb_master-slave.inc
--disable_warnings --disable_warnings
......
mysql-test/t/rpl_ndb_row_001.test
View file @ 52fd5447
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# By JBM 2005-02-15 Wrapped to allow reuse of test code# # By JBM 2005-02-15 Wrapped to allow reuse of test code#
######################################################## ########################################################
--source include/have_ndb.inc --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 -- source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
-- source extra/rpl_tests/rpl_row_001.test -- source extra/rpl_tests/rpl_row_001.test
mysql-test/t/rpl_ndb_sp003.test
View file @ 52fd5447
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# For different engines # # For different engines #
################################# #################################
-- source include/have_ndb.inc -- 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 -- source include/ndb_master-slave.inc
let $engine_type=NDBCLUSTER; let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_sp003.test -- source extra/rpl_tests/rpl_row_sp003.test
mysql-test/t/rpl_ndb_sp006.test
View file @ 52fd5447
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# For different engines # # For different engines #
################################# #################################
-- source include/have_ndb.inc -- 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 -- source include/ndb_master-slave.inc
let $engine_type=NDBCLUSTER; let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_sp006.test -- source extra/rpl_tests/rpl_row_sp006.test
mysql-test/t/rpl_ndb_sync.test
View file @ 52fd5447
--source include/have_ndb.inc --source include/have_ndb.inc
--source include/ndb_default_cluster.inc --source include/ndb_default_cluster.inc
--source include/not_embedded.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 --source include/ndb_master-slave.inc
# #
......
mysql-test/t/rpl_ndb_trig004.test
View file @ 52fd5447
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
############################################################################# #############################################################################
# Includes # Includes
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_mixed_or_row.inc
-- source include/have_ndb.inc -- source include/have_ndb.inc
-- source include/ndb_master-slave.inc -- source include/ndb_master-slave.inc
let $engine_type=NDB; let $engine_type=NDB;
......
mysql-test/t/rpl_ndbapi_multi.test
View file @ 52fd5447
-- source include/have_ndb.inc -- 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/have_ndbapi_examples.inc
-- source include/ndb_master-slave.inc -- source include/ndb_master-slave.inc
......
mysql-test/t/rpl_row_basic_7ndb.test
View file @ 52fd5447
-- source include/have_ndb.inc -- 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 -- source include/ndb_master-slave.inc
let $type= 'NDB' ; let $type= 'NDB' ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7