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 | ee09f9721165ff04c645516651a4ae3892ce7231 (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /storage/myisam/ha_myisam.cc | |
| parent | 54f3f65601142d7d942c4a81e953ae5439d0014f (diff) | |
| parent | 2283e1b510998ea904f118b0da50986ec4047de2 (diff) | |
| download | mariadb-git-ee09f9721165ff04c645516651a4ae3892ce7231.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/ha_myisam.cc')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 7 |
1 files changed, 5 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; |