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

16 files changed, 18 insertions, 34 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