Correct faulty merge, "mysql_priv.h" must be included for the ifdef...

Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work

Correct faulty merge, "mysql_priv.h" must be included for the ifdef...
Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work
7b7e6676 · msvensson@neptunus.(none) · f6ce081f · 7b7e6676
Commit 7b7e6676 authored Sep 12, 2006 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.cc +2 -2

No files found.
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -31,10 +31,10 @@ have disables the InnoDB inlining in this file. */
 #pragma implementation				// gcc: Class implementation
 #endif

-#ifdef WITH_INNOBASE_STORAGE_ENGINE
-
 #include <mysql_priv.h>

+#ifdef WITH_INNOBASE_STORAGE_ENGINE
+
 #include <m_ctype.h>
 #include <hash.h>
 #include <myisampack.h>