Fix for when compiling with HAVE_ISAM enabled

monty@narttu.mysql.fi · monty@narttu.mysql.fi · commit 524878e93587 · 2003-05-19T11:53:42.000+03:00
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@`
`29`	`29`	`#include "ha_innodb.h"`
`30`	`30`	`#endif`
`31`	`31`	`#include "ha_myisam.h"`
	`32`	`+#ifdef HAVE_ISAM`
	`33`	`+#include "ha_isam.h"`
	`34`	`+#endif`
`32`	`35`	`#include <nisam.h>`
`33`	`36`	`#include <thr_alarm.h>`
`34`	`37`	`#include <ft_global.h>`
`@@ -5048,12 +5051,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),`
`5048`	`5051`	`if (opt_isam)`
`5049`	`5052`	`{`
`5050`	`5053`	`isam_skip=0;`
`5051`		`- isam_innodb=SHOW_OPTION_YES;`
	`5054`	`+ have_isam= SHOW_OPTION_YES;`
`5052`	`5055`	`}`
`5053`	`5056`	`else`
`5054`	`5057`	`{`
`5055`	`5058`	`isam_skip=1;`
`5056`		`- isam_innodb=SHOW_OPTION_DISABLED;`
	`5059`	`+ have_isam= SHOW_OPTION_DISABLED;`
`5057`	`5060`	`}`
`5058`	`5061`	`#endif`
`5059`	`5062`	`break;`