Skip to content

M
MariaDB
Commit 7b7e6676 authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files
Options

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
parent f6ce081f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/innobase/handler/ha_innodb.cc
View file @ 7b7e6676
...@@ -31,10 +31,10 @@ have disables the InnoDB inlining in this file. */ ...@@ -31,10 +31,10 @@ have disables the InnoDB inlining in this file. */
#pragma implementation // gcc: Class implementation #pragma implementation // gcc: Class implementation
#endif #endif
#ifdef WITH_INNOBASE_STORAGE_ENGINE
#include <mysql_priv.h> #include <mysql_priv.h>
#ifdef WITH_INNOBASE_STORAGE_ENGINE
#include <m_ctype.h> #include <m_ctype.h>
#include <hash.h> #include <hash.h>
#include <myisampack.h> #include <myisampack.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7