From 7b7e66763cf1e34c76b8fe8c53d5f07dda909faf Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 12 Sep 2006 16:43:57 +0200
Subject: Correct faulty merge, "mysql_priv.h" must be included for the ifdef
 WITH_INNOBASE_STORAGE_ENGINE to work

---
 storage/innobase/handler/ha_innodb.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'storage')

diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index e5d1159a96a..754afa89378 100644
--- 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>
-- 
cgit v1.2.1