summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-05-19 11:53:42 +0300
committerunknown <monty@narttu.mysql.fi>2003-05-19 11:53:42 +0300
commit7c189b0dcf26ad8e408b8eaa7d69dbbe913ba421 (patch)
tree3a927824aa5700977b4293e3eaffa6dc4b49e9fb
parent2dd3c9298a2404cddc2e36e1710e6af3a05e5fc1 (diff)
downloadmariadb-git-7c189b0dcf26ad8e408b8eaa7d69dbbe913ba421.tar.gz
Fix for when compiling with HAVE_ISAM enabled
-rw-r--r--sql/mysqld.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d39b4ecd17f..f73bd6721f0 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -29,6 +29,9 @@
#include "ha_innodb.h"
#endif
#include "ha_myisam.h"
+#ifdef HAVE_ISAM
+#include "ha_isam.h"
+#endif
#include <nisam.h>
#include <thr_alarm.h>
#include <ft_global.h>
@@ -5048,12 +5051,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
if (opt_isam)
{
isam_skip=0;
- isam_innodb=SHOW_OPTION_YES;
+ have_isam= SHOW_OPTION_YES;
}
else
{
isam_skip=1;
- isam_innodb=SHOW_OPTION_DISABLED;
+ have_isam= SHOW_OPTION_DISABLED;
}
#endif
break;