diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-07-06 19:04:11 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-07-06 19:04:11 +0200 |
| commit | e21310b1ef9e13a57d44b5dd1b2a13437ce33d0e (patch) | |
| tree | a09752a19b72b5c1e4e9b385d78ee8a1af8bf144 | |
| parent | 6a2ef78c8980fb9b707c27c4d3833478838f6ec2 (diff) | |
| download | mariadb-git-e21310b1ef9e13a57d44b5dd1b2a13437ce33d0e.tar.gz | |
WL#3303
- row based ndb logging also in mixed
37 files changed, 37 insertions, 37 deletions
diff --git a/mysql-test/t/ndb_autodiscover3.test b/mysql-test/t/ndb_autodiscover3.test index 452ccc50b4d..10416aee11f 100644 --- a/mysql-test/t/ndb_autodiscover3.test +++ b/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; diff --git a/mysql-test/t/ndb_binlog_basic.test b/mysql-test/t/ndb_binlog_basic.test index e4642dc3230..0f63ced0697 100644 --- a/mysql-test/t/ndb_binlog_basic.test +++ b/mysql-test/t/ndb_binlog_basic.test @@ -1,5 +1,5 @@ -- 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; diff --git a/mysql-test/t/ndb_binlog_ddl_multi.test b/mysql-test/t/ndb_binlog_ddl_multi.test index e159fd6a24e..a70dbe2011f 100644 --- a/mysql-test/t/ndb_binlog_ddl_multi.test +++ b/mysql-test/t/ndb_binlog_ddl_multi.test @@ -1,5 +1,5 @@ -- 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; diff --git a/mysql-test/t/ndb_binlog_discover.test b/mysql-test/t/ndb_binlog_discover.test index 999079ad29c..e842b57093a 100644 --- a/mysql-test/t/ndb_binlog_discover.test +++ b/mysql-test/t/ndb_binlog_discover.test @@ -1,5 +1,5 @@ -- 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; diff --git a/mysql-test/t/ndb_binlog_ignore_db.test b/mysql-test/t/ndb_binlog_ignore_db.test index 8f80e53f2e4..013df54a76a 100644 --- a/mysql-test/t/ndb_binlog_ignore_db.test +++ b/mysql-test/t/ndb_binlog_ignore_db.test @@ -1,5 +1,5 @@ -- 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 diff --git a/mysql-test/t/ndb_binlog_log_bin.test b/mysql-test/t/ndb_binlog_log_bin.test index 921b8608795..75ac766fd25 100644 --- a/mysql-test/t/ndb_binlog_log_bin.test +++ b/mysql-test/t/ndb_binlog_log_bin.test @@ -1,5 +1,5 @@ -- 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; diff --git a/mysql-test/t/ndb_binlog_multi.test b/mysql-test/t/ndb_binlog_multi.test index 14bd7ef174b..c39034c71f6 100644 --- a/mysql-test/t/ndb_binlog_multi.test +++ b/mysql-test/t/ndb_binlog_multi.test @@ -1,5 +1,5 @@ -- 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; diff --git a/mysql-test/t/ndb_multi_row.test b/mysql-test/t/ndb_multi_row.test index 632a9fda89a..f7b0aa3035f 100644 --- a/mysql-test/t/ndb_multi_row.test +++ b/mysql-test/t/ndb_multi_row.test @@ -1,7 +1,7 @@ -- 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 diff --git a/mysql-test/t/rpl_ndb_UUID.test b/mysql-test/t/rpl_ndb_UUID.test index 7bae9a341a4..ea623a06fd1 100644 --- a/mysql-test/t/rpl_ndb_UUID.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_bank.test b/mysql-test/t/rpl_ndb_bank.test index c9b0d8bad9c..ce951f01212 100644 --- a/mysql-test/t/rpl_ndb_bank.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_basic.test b/mysql-test/t/rpl_ndb_basic.test index 5bec4aee8c6..ea7d80aef50 100644 --- a/mysql-test/t/rpl_ndb_basic.test +++ b/mysql-test/t/rpl_ndb_basic.test @@ -1,5 +1,5 @@ --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 diff --git a/mysql-test/t/rpl_ndb_blob.test b/mysql-test/t/rpl_ndb_blob.test index aa80ab8ede5..181d225d3c0 100644 --- a/mysql-test/t/rpl_ndb_blob.test +++ b/mysql-test/t/rpl_ndb_blob.test @@ -1,5 +1,5 @@ --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 # diff --git a/mysql-test/t/rpl_ndb_blob2.test b/mysql-test/t/rpl_ndb_blob2.test index d94294eedcb..64f6f5e4f42 100644 --- a/mysql-test/t/rpl_ndb_blob2.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_circular.test b/mysql-test/t/rpl_ndb_circular.test index 34fcf968199..62583188e34 100644 --- a/mysql-test/t/rpl_ndb_circular.test +++ b/mysql-test/t/rpl_ndb_circular.test @@ -1,5 +1,5 @@ --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 diff --git a/mysql-test/t/rpl_ndb_circular_simplex.test b/mysql-test/t/rpl_ndb_circular_simplex.test index 633bbd75006..b24dab4b6fe 100644 --- a/mysql-test/t/rpl_ndb_circular_simplex.test +++ b/mysql-test/t/rpl_ndb_circular_simplex.test @@ -1,5 +1,5 @@ --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; diff --git a/mysql-test/t/rpl_ndb_dd_advance.test b/mysql-test/t/rpl_ndb_dd_advance.test index 723672931ab..a7e00262f5c 100644 --- a/mysql-test/t/rpl_ndb_dd_advance.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_dd_basic.test b/mysql-test/t/rpl_ndb_dd_basic.test index ca583860b91..ac0ab01f8dd 100644 --- a/mysql-test/t/rpl_ndb_dd_basic.test +++ b/mysql-test/t/rpl_ndb_dd_basic.test @@ -1,5 +1,5 @@ --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 diff --git a/mysql-test/t/rpl_ndb_dd_partitions.test b/mysql-test/t/rpl_ndb_dd_partitions.test index fe6db98dd13..c84854e89e8 100644 --- a/mysql-test/t/rpl_ndb_dd_partitions.test +++ b/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 --- diff --git a/mysql-test/t/rpl_ndb_ddl.test b/mysql-test/t/rpl_ndb_ddl.test index f2c32ac2cd5..654d1c08944 100644 --- a/mysql-test/t/rpl_ndb_ddl.test +++ b/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; diff --git a/mysql-test/t/rpl_ndb_delete_nowhere.test b/mysql-test/t/rpl_ndb_delete_nowhere.test index 49ba07b2fde..bbd67e4d8d2 100644 --- a/mysql-test/t/rpl_ndb_delete_nowhere.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_do_db.test b/mysql-test/t/rpl_ndb_do_db.test index 3e450a1fe4b..c0f85dd8981 100644 --- a/mysql-test/t/rpl_ndb_do_db.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_do_table.test b/mysql-test/t/rpl_ndb_do_table.test index 6e36ab407a1..3f46c6fbda4 100644 --- a/mysql-test/t/rpl_ndb_do_table.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_extraCol.test b/mysql-test/t/rpl_ndb_extraCol.test index 292b8bbfa45..9cf4f8dba0b 100644 --- a/mysql-test/t/rpl_ndb_extraCol.test +++ b/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'; diff --git a/mysql-test/t/rpl_ndb_func003.test b/mysql-test/t/rpl_ndb_func003.test index f91c891f943..90315a01150 100644 --- a/mysql-test/t/rpl_ndb_func003.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_idempotent.test b/mysql-test/t/rpl_ndb_idempotent.test index 0bae33c5d40..3133ad34f0c 100644 --- a/mysql-test/t/rpl_ndb_idempotent.test +++ b/mysql-test/t/rpl_ndb_idempotent.test @@ -1,5 +1,5 @@ --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 # diff --git a/mysql-test/t/rpl_ndb_insert_ignore.test b/mysql-test/t/rpl_ndb_insert_ignore.test index 5137c81c0cd..3ef360e3fdf 100644 --- a/mysql-test/t/rpl_ndb_insert_ignore.test +++ b/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; diff --git a/mysql-test/t/rpl_ndb_multi.test b/mysql-test/t/rpl_ndb_multi.test index ab92b65ba19..dacb1307a7b 100644 --- a/mysql-test/t/rpl_ndb_multi.test +++ b/mysql-test/t/rpl_ndb_multi.test @@ -1,5 +1,5 @@ --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 diff --git a/mysql-test/t/rpl_ndb_multi_update2.test b/mysql-test/t/rpl_ndb_multi_update2.test index 75f4b63aae2..6b86f8146f8 100644 --- a/mysql-test/t/rpl_ndb_multi_update2.test +++ b/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; diff --git a/mysql-test/t/rpl_ndb_multi_update3.test b/mysql-test/t/rpl_ndb_multi_update3.test index fbf44d66408..3e7042a0cfa 100644 --- a/mysql-test/t/rpl_ndb_multi_update3.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_rep_ignore.test b/mysql-test/t/rpl_ndb_rep_ignore.test index f010d96b5ee..c4e9e701251 100644 --- a/mysql-test/t/rpl_ndb_rep_ignore.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_row_001.test b/mysql-test/t/rpl_ndb_row_001.test index 4429ea177d3..5b1090c0d41 100644 --- a/mysql-test/t/rpl_ndb_row_001.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_sp003.test b/mysql-test/t/rpl_ndb_sp003.test index 1774a313851..599124ad9bd 100644 --- a/mysql-test/t/rpl_ndb_sp003.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_sp006.test b/mysql-test/t/rpl_ndb_sp006.test index 0003781f54e..7476e7c114a 100644 --- a/mysql-test/t/rpl_ndb_sp006.test +++ b/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 diff --git a/mysql-test/t/rpl_ndb_sync.test b/mysql-test/t/rpl_ndb_sync.test index 6db75cf1e36..116f0879ca0 100644 --- a/mysql-test/t/rpl_ndb_sync.test +++ b/mysql-test/t/rpl_ndb_sync.test @@ -1,7 +1,7 @@ --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 # diff --git a/mysql-test/t/rpl_ndb_trig004.test b/mysql-test/t/rpl_ndb_trig004.test index f9674e43c50..5544ded056f 100644 --- a/mysql-test/t/rpl_ndb_trig004.test +++ b/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; diff --git a/mysql-test/t/rpl_ndbapi_multi.test b/mysql-test/t/rpl_ndbapi_multi.test index c33d0d296ad..5067722bb79 100644 --- a/mysql-test/t/rpl_ndbapi_multi.test +++ b/mysql-test/t/rpl_ndbapi_multi.test @@ -1,5 +1,5 @@ -- 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 diff --git a/mysql-test/t/rpl_row_basic_7ndb.test b/mysql-test/t/rpl_row_basic_7ndb.test index 7cf039a1c21..3a17de1bc9e 100644 --- a/mysql-test/t/rpl_row_basic_7ndb.test +++ b/mysql-test/t/rpl_row_basic_7ndb.test @@ -1,5 +1,5 @@ -- 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' ; |