From 20af76aa7c7637dd1c980024cf6f3e090aa3f7c5 Mon Sep 17 00:00:00 2001
From: unknown <jcole@mugatu.spaceapes.com>
Date: Thu, 25 Jul 2002 00:12:42 -0500
Subject: [PATCH] Moved have_* to mysql_priv.h.

mysql_priv.h:
  Added have_berkeley_db and have_innodb.
ha_innodb.h:
  Removed have_innodb.
ha_berkeley.h:
  Removed have_berkeley_db.


sql/ha_berkeley.h:
  Removed have_berkeley_db.
sql/ha_innodb.h:
  Removed have_innodb.
sql/mysql_priv.h:
  Added have_berkeley_db and have_innodb.
---
 sql/ha_berkeley.h | 1 -
 sql/ha_innodb.h   | 1 -
 sql/mysql_priv.h  | 5 ++++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index ae425421c70..198664d0c06 100644
--- a/sql/ha_berkeley.h
+++ b/sql/ha_berkeley.h
@@ -167,7 +167,6 @@ class ha_berkeley: public handler
 };
 
 extern bool berkeley_skip, berkeley_shared_data;
-extern SHOW_COMP_OPTION have_berkeley_db;
 extern u_int32_t berkeley_init_flags,berkeley_env_flags, berkeley_lock_type,
                  berkeley_lock_types[];
 extern ulong berkeley_cache_size, berkeley_max_lock, berkeley_log_buffer_size;
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index 4924056f5d2..ce320737ef6 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -169,7 +169,6 @@ class ha_innobase: public handler
 };
 
 extern bool innodb_skip;
-extern SHOW_COMP_OPTION have_innodb;
 extern uint innobase_init_flags, innobase_lock_type;
 extern ulong innobase_cache_size;
 extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 6dc70d0a86c..f34b2671175 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -659,7 +659,10 @@ extern SHOW_VAR init_vars[],status_vars[], internal_vars[];
 extern struct system_variables global_system_variables;
 extern struct system_variables max_system_variables;
 
-extern SHOW_COMP_OPTION have_isam, have_raid, have_openssl, have_symlink;
+/* optional things, have_* variables */
+
+extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db;
+extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink;
 extern SHOW_COMP_OPTION have_query_cache;
 
 #ifndef __WIN__