diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
| commit | fa3b2dcb838a05f5c07b78c2fc518018c473a47f (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /storage/myisam | |
| parent | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (diff) | |
| parent | fe0828b3b8193e086abe740572c9b0cb2b7da671 (diff) | |
| download | mariadb-git-fa3b2dcb838a05f5c07b78c2fc518018c473a47f.tar.gz | |
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_priv.h
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 7 | ||||
| -rw-r--r-- | storage/myisam/ha_myisam.h | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index ab43e126ab4..e0e104a4878 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -19,9 +19,10 @@ #endif #define MYSQL_SERVER 1 -#include "mysql_priv.h" +#include "sql_priv.h" #include "probes_mysql.h" -#include <mysql/plugin.h> +#include "key.h" // key_copy +#include "sql_plugin.h" #include <m_ctype.h> #include <my_bit.h> #include <myisampack.h> @@ -29,6 +30,8 @@ #include <stdarg.h> #include "myisamdef.h" #include "rt_index.h" +#include "sql_table.h" // tablename_to_filename +#include "sql_class.h" // THD ulonglong myisam_recover_options; static ulong opt_myisam_block_size; diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h index 2f41670b934..f08150215a6 100644 --- a/storage/myisam/ha_myisam.h +++ b/storage/myisam/ha_myisam.h @@ -22,6 +22,11 @@ #include <myisam.h> #include <ft_global.h> +#include "handler.h" /* handler */ +#include "table.h" /* TABLE_SHARE */ + +struct TABLE_SHARE; +typedef struct st_ha_create_information HA_CREATE_INFO; #define HA_RECOVER_DEFAULT 1 /* Automatic recover active */ #define HA_RECOVER_BACKUP 2 /* Make a backupfile on recover */ |