Removed ifdef need.
Cleaned up test to no longer need have_
This commit is contained in:
parent
343e08391d
commit
63d78a7659
@ -1,4 +1,4 @@
|
||||
--require r/have_archive.require
|
||||
--disable_query_log
|
||||
show variables like "have_archive";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'archive';
|
||||
--enable_query_log
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_blackhole.require
|
||||
disable_query_log;
|
||||
show variables like "have_blackhole_engine";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'blackhole';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_csv.require
|
||||
disable_query_log;
|
||||
show variables like "have_csv";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'csv';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_exampledb.require
|
||||
disable_query_log;
|
||||
show variables like "have_example_engine";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'example';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_federated_db.require
|
||||
disable_query_log;
|
||||
show variables like "have_federated_engine";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'federated';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_innodb.require
|
||||
disable_query_log;
|
||||
show variables like "have_innodb";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'innodb';
|
||||
enable_query_log;
|
||||
|
@ -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'
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Check that server is compiled and started with support for NDB
|
||||
-- require r/have_ndb.require
|
||||
disable_query_log;
|
||||
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 NDB is installed and known to be working
|
||||
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_archive YES
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_blackhole_engine YES
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_csv YES
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_example_engine YES
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_federated_engine YES
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_innodb YES
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_ndbcluster YES
|
@ -1,2 +0,0 @@
|
||||
Variable_name Value
|
||||
have_raid YES
|
@ -1624,67 +1624,34 @@ extern TYPELIB log_output_typelib;
|
||||
|
||||
/* optional things, have_* variables */
|
||||
|
||||
#ifdef WITH_INNOBASE_STORAGE_ENGINE
|
||||
extern handlerton *innobase_hton;
|
||||
extern SHOW_COMP_OPTION have_innodb;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_innodb;
|
||||
#endif
|
||||
#ifdef WITH_EXAMPLE_STORAGE_ENGINE
|
||||
extern handlerton *example_hton;
|
||||
extern SHOW_COMP_OPTION have_example_db;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_example_db;
|
||||
#endif
|
||||
#ifdef WITH_ARCHIVE_STORAGE_ENGINE
|
||||
extern handlerton *archive_hton;
|
||||
extern SHOW_COMP_OPTION have_archive_db;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_archive_db;
|
||||
#endif
|
||||
extern SHOW_COMP_OPTION have_csv_db;
|
||||
extern SHOW_COMP_OPTION have_federated_db;
|
||||
extern SHOW_COMP_OPTION have_blackhole_db;
|
||||
extern SHOW_COMP_OPTION have_ndbcluster;
|
||||
extern SHOW_COMP_OPTION have_partition_db;
|
||||
extern SHOW_COMP_OPTION have_merge_db;
|
||||
|
||||
#ifdef WITH_CSV_STORAGE_ENGINE
|
||||
extern handlerton *tina_hton;
|
||||
extern SHOW_COMP_OPTION have_csv_db;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_csv_db;
|
||||
#endif
|
||||
#ifdef WITH_FEDERATED_STORAGE_ENGINE
|
||||
extern handlerton *federated_hton;
|
||||
extern SHOW_COMP_OPTION have_federated_db;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_federated_db;
|
||||
#endif
|
||||
#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
|
||||
extern handlerton *blackhole_hton;
|
||||
extern SHOW_COMP_OPTION have_blackhole_db;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_blackhole_db;
|
||||
#endif
|
||||
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
|
||||
extern handlerton *ndbcluster_hton;
|
||||
extern SHOW_COMP_OPTION have_ndbcluster;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_ndbcluster;
|
||||
#endif
|
||||
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
||||
extern handlerton *partition_hton;
|
||||
extern SHOW_COMP_OPTION have_partition_db;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_partition_db;
|
||||
#endif
|
||||
|
||||
#ifdef WITH_MYISAMMRG_STORAGE_ENGINE
|
||||
extern handlerton *myisammrg_hton;
|
||||
extern SHOW_COMP_OPTION have_merge_db;
|
||||
#else
|
||||
extern SHOW_COMP_OPTION have_merge_db;
|
||||
#endif
|
||||
|
||||
extern handlerton *myisam_hton;
|
||||
extern handlerton *heap_hton;
|
||||
|
||||
extern SHOW_COMP_OPTION have_row_based_replication;
|
||||
extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen;
|
||||
extern SHOW_COMP_OPTION have_openssl, have_symlink, have_dlopen;
|
||||
extern SHOW_COMP_OPTION have_query_cache;
|
||||
extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
|
||||
extern SHOW_COMP_OPTION have_crypt;
|
||||
|
Loading…
x
Reference in New Issue
Block a user