diff options
| author | unknown <jmiller@mysql.com> | 2006-05-12 14:09:13 +0200 |
|---|---|---|
| committer | unknown <jmiller@mysql.com> | 2006-05-12 14:09:13 +0200 |
| commit | 07f3ca8ccef5262ab65b7bdf0ac56ad4d8dc1052 (patch) | |
| tree | df17ce63f1144176e0ef775d398db62e0b597420 | |
| parent | 9432330113c753fcf2b44846073eae106ab333c9 (diff) | |
| download | mariadb-git-07f3ca8ccef5262ab65b7bdf0ac56ad4d8dc1052.tar.gz | |
rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test:
Updated per lars
rpl_row_flsh_tbls.test:
updated per lars
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
Updated per lars
mysql-test/t/rpl_row_flsh_tbls.test:
updated per lars
mysql-test/t/rpl_multi_engine.test:
Updated per lars
mysql-test/t/rpl_row_basic_11bugs.test:
Updated per lars
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_flsh_tbls.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_multi_engine.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl_row_basic_11bugs.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl_row_flsh_tbls.test | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test index 8406c10af9b..7a097fd1eae 100644 --- a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test +++ b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test @@ -4,8 +4,6 @@ # Test of FLUSH NO_WRITE_TO_BINLOG by the way. # -# Merge will not work with a default ndb engine --- source include/not_ndb_default.inc -- source include/master-slave.inc diff --git a/mysql-test/t/rpl_multi_engine.test b/mysql-test/t/rpl_multi_engine.test index 9ebbdfe27de..10780c765f7 100644 --- a/mysql-test/t/rpl_multi_engine.test +++ b/mysql-test/t/rpl_multi_engine.test @@ -1,6 +1,7 @@ # See if replication between MyISAM, MEMORY and InnoDB works. -# Results files do not match when ndb is default +#This test case is not written for NDB, result files do not +#match when NDB is the default engine -- source include/not_ndb_default.inc -- source include/master-slave.inc diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test index f0a66acc681..3a686ea6b3d 100644 --- a/mysql-test/t/rpl_row_basic_11bugs.test +++ b/mysql-test/t/rpl_row_basic_11bugs.test @@ -1,7 +1,9 @@ --source include/have_row_based.inc --source include/have_binlog_format_row.inc -# Show binlog events will cause failure when ndb is default + +#This test case is not written for NDB, the result files +#will not match when NDB is the default engine -- source include/not_ndb_default.inc --source include/master-slave.inc diff --git a/mysql-test/t/rpl_row_flsh_tbls.test b/mysql-test/t/rpl_row_flsh_tbls.test index 1a81da39896..9e8efc1ac9c 100644 --- a/mysql-test/t/rpl_row_flsh_tbls.test +++ b/mysql-test/t/rpl_row_flsh_tbls.test @@ -6,6 +6,11 @@ let $rename_event_pos= 615; # Bug#18326: Do not lock table for writing during prepare of statement # The use of the ps protocol causes extra table maps in the binlog, so # we disable the ps-protocol for this statement. + +# Merge tables are not supported in NDB +-- source include/not_ndb_default.inc + + --disable_ps_protocol -- source extra/rpl_tests/rpl_flsh_tbls.test --enable_ps_protocol |