diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-04-20 10:51:50 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-04-20 10:51:50 +0200 |
| commit | f2587df7ba758a990deb45c93cedf0494ef25061 (patch) | |
| tree | 3c10718d95da445db1e1f9405aa01297659a8739 /sql/handler.cc | |
| parent | b12af816d57cd986b321231796ed6aec4190fb1b (diff) | |
| parent | 4ca8066fa93bf67fb69cfe17689262a50263e4ca (diff) | |
| download | mariadb-git-f2587df7ba758a990deb45c93cedf0494ef25061.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 8431f610d46..ee02441e7ff 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -23,8 +23,19 @@ #pragma implementation // gcc: Class implementation #endif -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" #include "rpl_handler.h" +#include "sql_cache.h" // query_cache, query_cache_* +#include "key.h" // key_copy, key_unpack, key_cmp_if_same, key_cmp +#include "sql_table.h" // build_table_filename +#include "lock.h" // wait_if_global_read_lock, + // start_waiting_global_read_lock +#include "sql_parse.h" // check_stack_overrun +#include "sql_acl.h" // SUPER_ACL +#include "sql_base.h" // free_io_cache +#include "discover.h" // writefrm +#include "log_event.h" // *_rows_log_event #include "rpl_filter.h" #include <myisampack.h> #include "transaction.h" |