diff options
| author | unknown <serg@serg.mylan> | 2006-06-02 20:11:36 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-06-02 20:11:36 +0200 |
| commit | 202c3fae0881979062998a2340fafc4a53ba6f3a (patch) | |
| tree | 7f1e2cd075cfaf402f76ac2ab05467b524dc6595 /sql/ha_innodb.cc | |
| parent | 0c68b7104fb92ff0998c17d2b71534ec23a7f8ad (diff) | |
| parent | faea23dc023027d02bff8eccaefab8d9ee2d4cb8 (diff) | |
| download | mariadb-git-202c3fae0881979062998a2340fafc4a53ba6f3a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 58249cf9f9a..0e909c83238 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -42,6 +42,8 @@ have disables the InnoDB inlining in this file. */ #define MAX_ULONG_BIT ((ulong) 1 << (sizeof(ulong)*8-1)) +#ifdef WITH_INNOBASE_STORAGE_ENGINE + #include "ha_innodb.h" pthread_mutex_t innobase_share_mutex, /* to protect innobase_open_files */ @@ -7459,3 +7461,5 @@ mysql_declare_plugin(innobase) } mysql_declare_plugin_end; +#endif + |