diff options
author | unknown <brian@zim.(none)> | 2006-09-19 13:58:12 -0700 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-09-19 13:58:12 -0700 |
commit | 9b45c8ed9e6bf2c255ea20115e14f49e066c1e16 (patch) | |
tree | 8364031c170301618fd35f8ccb9c0755c63e35a3 /mysql-test/include/have_multi_ndb.inc | |
parent | daaf51fbe97d13acc13cb457ab6adc435fd93114 (diff) | |
download | mariadb-git-9b45c8ed9e6bf2c255ea20115e14f49e066c1e16.tar.gz |
Removed ifdef need.
Cleaned up test to no longer need have_
BitKeeper/deleted/.del-have_archive.require:
Delete: mysql-test/r/have_archive.require
BitKeeper/deleted/.del-have_blackhole.require:
Delete: mysql-test/r/have_blackhole.require
BitKeeper/deleted/.del-have_csv.require:
Delete: mysql-test/r/have_csv.require
BitKeeper/deleted/.del-have_exampledb.require:
Delete: mysql-test/r/have_exampledb.require
BitKeeper/deleted/.del-have_federated_db.require:
Delete: mysql-test/r/have_federated_db.require
BitKeeper/deleted/.del-have_innodb.require:
Delete: mysql-test/r/have_innodb.require
BitKeeper/deleted/.del-have_ndb.require:
Delete: mysql-test/r/have_ndb.require
BitKeeper/deleted/.del-have_raid.require:
Delete: mysql-test/r/have_raid.require
mysql-test/include/have_archive.inc:
Rewrite of test to use new syntax
mysql-test/include/have_blackhole.inc:
Test rewritten to use new syntax
mysql-test/include/have_csv.inc:
Test rewrite
mysql-test/include/have_exampledb.inc:
Test rewrite
mysql-test/include/have_federated_db.inc:
Test rewrite
mysql-test/include/have_innodb.inc:
Test rewrite
mysql-test/include/have_multi_ndb.inc:
Test rewrite
mysql-test/include/have_ndb.inc:
Test rewrite
sql/mysql_priv.h:
Removed unneeded ifdef
Diffstat (limited to 'mysql-test/include/have_multi_ndb.inc')
-rw-r--r-- | mysql-test/include/have_multi_ndb.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc index 45a551274f7..218a6852c41 100644 --- a/mysql-test/include/have_multi_ndb.inc +++ b/mysql-test/include/have_multi_ndb.inc @@ -9,8 +9,8 @@ disable_query_log; drop table if exists t1, t2; --enable_warnings flush tables; ---require r/have_ndb.require -show variables like "have_ndbcluster"; +--require r/true.require +select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster'; enable_query_log; # Check that server2 has NDB support @@ -20,8 +20,8 @@ disable_query_log; drop table if exists t1, t2; --enable_warnings flush tables; ---require r/have_ndb.require -show variables like "have_ndbcluster"; +--require r/true.require +select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster'; enable_query_log; # Set the default connection to 'server1' |