summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <acurtis@pcgem.rdg.cyberkinetica.com>2004-03-02 10:08:50 +0000
committerunknown <acurtis@pcgem.rdg.cyberkinetica.com>2004-03-02 10:08:50 +0000
commit8286684e26d1639b56c942e0cce6c238a11f2a92 (patch)
treeee23acf7cad95fc887d54d11249945d1247621ad /libmysqld
parent722e0ec37827de7fc8bc17030cac43a9f27c35d7 (diff)
downloadmariadb-git-8286684e26d1639b56c942e0cce6c238a11f2a92.tar.gz
Cleanup ha_checktype() and redundant variables.
libmysqld/lib_sql.cc: Removing *_skip variables sql/ha_berkeley.cc: Removing *_skip variables sql/ha_berkeley.h: Removing *_skip variables sql/ha_innodb.cc: Removing *_skip variables sql/ha_innodb.h: Removing *_skip variables sql/ha_isam.cc: Removing *_skip variables sql/ha_isam.h: Removing *_skip variables sql/handler.cc: Removing *_skip variables Cleanup ha_checktype() sql/mysqld.cc: Removing *_skip variables sql/sql_show.cc: Removing *_skip variables
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index f44b14b0030..5366a8fd62e 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -419,7 +419,7 @@ int init_embedded_server(int argc, char **argv, char **groups)
if (
#ifdef HAVE_BERKELEY_DB
- !berkeley_skip ||
+ (have_berkeley_db == SHOW_OPTION_YES) ||
#endif
(flush_time && flush_time != ~(ulong) 0L))
{