database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam to

Browse Source 
mysql-trunk-merge.

Conflicts:

Text conflict in sql/sql_priv.h
This commit is contained in:
Alexey Kopytov
2010-04-19 16:09:44 +04:00
parent 199f2ce47e fe0828b3b8
commit fa3b2dcb83
326 changed files with 5719 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_insert.cc
View File

@ -54,12 +54,24 @@
*/
#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_insert.h"
#include "sql_update.h" // compare_record
#include "sql_base.h" // close_thread_tables
#include "sql_cache.h" // query_cache_*
#include "key.h" // key_copy
#include "lock.h" // mysql_unlock_tables
#include "sp_head.h"
#include "sql_view.h" // check_key_in_view, insert_view_fields
#include "sql_table.h" // mysql_create_table_no_lock
#include "sql_acl.h" // *_ACL, check_grant_all_columns
#include "sql_trigger.h"
#include "sql_select.h"
#include "sql_show.h"
#include "slave.h"
#include "sql_parse.h" // end_active_trans
#include "rpl_mi.h"
#include "transaction.h"
#include "sql_audit.h"