diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_multi_ndb.inc | 4 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/t/disabled.def | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc index 8b1c39825bc..8dbfa2aa034 100644 --- a/mysql-test/include/have_multi_ndb.inc +++ b/mysql-test/include/have_multi_ndb.inc @@ -4,7 +4,7 @@ connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,); # Check that server1 has NDB support connection server1; -let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'engines', Tables_in_information_schema (engines), 1); +let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'ENGINES', Tables_in_information_schema (ENGINES), 1); disable_query_log; if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`) { @@ -16,7 +16,7 @@ enable_query_log; # Check that server2 has NDB support connection server2; -let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'engines', Tables_in_information_schema (engines), 1); +let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'ENGINES', Tables_in_information_schema (ENGINES), 1); disable_query_log; if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`) { diff --git a/mysql-test/suite/ndb/t/disabled.def b/mysql-test/suite/ndb/t/disabled.def index 823ffa62010..f876039a042 100644 --- a/mysql-test/suite/ndb/t/disabled.def +++ b/mysql-test/suite/ndb/t/disabled.def @@ -11,10 +11,7 @@ ############################################################################## partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table -ndb_binlog_log_bin : Bug #34244 2008-02-02 mats Test ndb_binlog_log_bin fails for 'drop table if exists t1,t2,t3' -ndb_binlog_multi : Bug #34245 2008-02-02 mats Test ndb_binlog_multi fails for 'CREATE TABLE' ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms -rpl_ndb_transaction : Bug #34246 2008-02-02 mats Test rpl_ndb_transaction fails with 'Failed to create 'mysql/ndb_apply_status' # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open #ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test index 8cca8202bea..3c7c15926a4 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test @@ -6,6 +6,7 @@ source include/ndb_master-slave.inc; source include/have_ndb.inc; +source include/have_debug.inc; CREATE TABLE tmyisam (a int) ENGINE = MYISAM; CREATE TABLE tinnodb (a int) ENGINE = INNODB; |