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/sql_update.cc | |
| parent | b12af816d57cd986b321231796ed6aec4190fb1b (diff) | |
| parent | 4ca8066fa93bf67fb69cfe17689262a50263e4ca (diff) | |
| download | mariadb-git-f2587df7ba758a990deb45c93cedf0494ef25061.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 1fac036876d..41737b33fb6 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -19,12 +19,28 @@ Multi-table updates were introduced by Sinisa & Monty */ -#include "mysql_priv.h" +#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "sql_priv.h" +#include "unireg.h" // REQUIRED: for other includes +#include "sql_update.h" +#include "sql_cache.h" // query_cache_* +#include "sql_base.h" // close_tables_for_reopen +#include "sql_parse.h" // cleanup_items +#include "sql_partition.h" // partition_key_modified #include "sql_select.h" +#include "sql_view.h" // check_key_in_view #include "sp_head.h" #include "sql_trigger.h" #include "probes_mysql.h" #include "debug_sync.h" +#include "key.h" // is_key_used +#include "sql_acl.h" // *_ACL, check_grant +#include "records.h" // init_read_record, + // end_read_record +#include "filesort.h" // filesort +#include "sql_derived.h" // mysql_derived_prepare, + // mysql_handle_derived, + // mysql_derived_filling /* Return 0 if row hasn't changed */ |