diff options
| author | msvensson@neptunus.(none) <> | 2006-09-12 16:43:57 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-09-12 16:43:57 +0200 |
| commit | 7b7e66763cf1e34c76b8fe8c53d5f07dda909faf (patch) | |
| tree | 905e71fbe3a47a524521d273df436361c7051bf4 /storage | |
| parent | f6ce081f6a8c1d4af2fb1320b8fdd3653c1b7784 (diff) | |
| download | mariadb-git-7b7e66763cf1e34c76b8fe8c53d5f07dda909faf.tar.gz | |
Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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> |