summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorbrian@zim.(none) <>2005-03-24 16:08:48 -0800
committerbrian@zim.(none) <>2005-03-24 16:08:48 -0800
commit6e2caeb0ce2cbbd5cb341d8258b4bcb33682fde5 (patch)
tree6d8d1b8770aad1266d083d417695c3eeca4752c3 /sql/mysqld.cc
parenteaa057e97af74def076a225a48113d9de2e09134 (diff)
parente65b96693c8aa44118555946ab2787d311d40217 (diff)
downloadmariadb-git-6e2caeb0ce2cbbd5cb341d8258b4bcb33682fde5.tar.gz
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 39047990351..84c9aeb7953 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -398,6 +398,7 @@ SHOW_COMP_OPTION have_berkeley_db, have_innodb, have_isam, have_ndbcluster,
SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache;
SHOW_COMP_OPTION have_geometry, have_rtree_keys;
SHOW_COMP_OPTION have_crypt, have_compress;
+SHOW_COMP_OPTION have_blackhole_db;
/* Thread specific variables */
@@ -5769,6 +5770,11 @@ static void mysql_init_variables(void)
#else
have_archive_db= SHOW_OPTION_NO;
#endif
+#ifdef HAVE_BLACKHOLE_DB
+ have_blackhole_db= SHOW_OPTION_YES;
+#else
+ have_blackhole_db= SHOW_OPTION_NO;
+#endif
#ifdef HAVE_CSV_DB
have_csv_db= SHOW_OPTION_YES;
#else