summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/include/have_archive.inc4
-rw-r--r--mysql-test/include/have_blackhole.inc4
-rw-r--r--mysql-test/include/have_csv.inc4
-rw-r--r--mysql-test/include/have_exampledb.inc4
-rw-r--r--mysql-test/include/have_federated_db.inc4
-rw-r--r--mysql-test/include/have_innodb.inc4
-rw-r--r--mysql-test/include/have_multi_ndb.inc8
-rw-r--r--mysql-test/include/have_ndb.inc4
-rw-r--r--mysql-test/r/have_archive.require2
-rw-r--r--mysql-test/r/have_blackhole.require2
-rw-r--r--mysql-test/r/have_csv.require2
-rw-r--r--mysql-test/r/have_exampledb.require2
-rw-r--r--mysql-test/r/have_federated_db.require2
-rw-r--r--mysql-test/r/have_innodb.require2
-rw-r--r--mysql-test/r/have_ndb.require2
-rw-r--r--mysql-test/r/have_raid.require2
-rw-r--r--sql/mysql_priv.h47
17 files changed, 25 insertions, 74 deletions
diff --git a/mysql-test/include/have_archive.inc b/mysql-test/include/have_archive.inc
index 262f66076a8..9f0038db97a 100644
--- a/mysql-test/include/have_archive.inc
+++ b/mysql-test/include/have_archive.inc
@@ -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
diff --git a/mysql-test/include/have_blackhole.inc b/mysql-test/include/have_blackhole.inc
index c2b6ea18830..e13cff52094 100644
--- a/mysql-test/include/have_blackhole.inc
+++ b/mysql-test/include/have_blackhole.inc
@@ -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;
diff --git a/mysql-test/include/have_csv.inc b/mysql-test/include/have_csv.inc
index d28199831b8..3175fc16fe7 100644
--- a/mysql-test/include/have_csv.inc
+++ b/mysql-test/include/have_csv.inc
@@ -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;
diff --git a/mysql-test/include/have_exampledb.inc b/mysql-test/include/have_exampledb.inc
index 7ddd15c48b3..e3fd068b485 100644
--- a/mysql-test/include/have_exampledb.inc
+++ b/mysql-test/include/have_exampledb.inc
@@ -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;
diff --git a/mysql-test/include/have_federated_db.inc b/mysql-test/include/have_federated_db.inc
index e4cf1366fda..abef5a64d30 100644
--- a/mysql-test/include/have_federated_db.inc
+++ b/mysql-test/include/have_federated_db.inc
@@ -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;
diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc
index 4f83d378cbc..be8850725e5 100644
--- a/mysql-test/include/have_innodb.inc
+++ b/mysql-test/include/have_innodb.inc
@@ -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;
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'
diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc
index 8c277ea82a0..be339d41238 100644
--- a/mysql-test/include/have_ndb.inc
+++ b/mysql-test/include/have_ndb.inc
@@ -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
diff --git a/mysql-test/r/have_archive.require b/mysql-test/r/have_archive.require
deleted file mode 100644
index c4b4ba24fcd..00000000000
--- a/mysql-test/r/have_archive.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_archive YES
diff --git a/mysql-test/r/have_blackhole.require b/mysql-test/r/have_blackhole.require
deleted file mode 100644
index 15029a460f6..00000000000
--- a/mysql-test/r/have_blackhole.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_blackhole_engine YES
diff --git a/mysql-test/r/have_csv.require b/mysql-test/r/have_csv.require
deleted file mode 100644
index cc2fb28289c..00000000000
--- a/mysql-test/r/have_csv.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_csv YES
diff --git a/mysql-test/r/have_exampledb.require b/mysql-test/r/have_exampledb.require
deleted file mode 100644
index 29d0cf8b1a6..00000000000
--- a/mysql-test/r/have_exampledb.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_example_engine YES
diff --git a/mysql-test/r/have_federated_db.require b/mysql-test/r/have_federated_db.require
deleted file mode 100644
index f4c521a8f35..00000000000
--- a/mysql-test/r/have_federated_db.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_federated_engine YES
diff --git a/mysql-test/r/have_innodb.require b/mysql-test/r/have_innodb.require
deleted file mode 100644
index 48a764a6c58..00000000000
--- a/mysql-test/r/have_innodb.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_innodb YES
diff --git a/mysql-test/r/have_ndb.require b/mysql-test/r/have_ndb.require
deleted file mode 100644
index f0402b72c6a..00000000000
--- a/mysql-test/r/have_ndb.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_ndbcluster YES
diff --git a/mysql-test/r/have_raid.require b/mysql-test/r/have_raid.require
deleted file mode 100644
index 8390f4dbb85..00000000000
--- a/mysql-test/r/have_raid.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name Value
-have_raid YES
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 9ee3c3e2e03..ea40e96c534 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -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
-#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;
+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;
#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;
View Lorry Controller Status