database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +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_class.cc
View File

@@ -25,7 +25,18 @@
#pragma implementation // gcc: Class implementation
#endif
#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_class.h"
#include "lock.h" // unlock_global_read_lock, mysql_unlock_tables
#include "sql_cache.h" // query_cache_abort
#include "sql_base.h" // close_thread_tables
#include "sql_time.h" // date_time_format_copy
#include "sql_acl.h" // NO_ACCESS,
// acl_getroot_no_password
#include "sql_base.h" // close_temporary_tables
#include "sql_handler.h" // mysql_ha_cleanup
#include "rpl_rli.h"
#include "rpl_filter.h"
#include "rpl_record.h"
@@ -46,6 +57,7 @@
#include "sp_cache.h"
#include "transaction.h"
#include "debug_sync.h"
#include "sql_parse.h" // is_update_query
/*
The following is used to initialise Table_ident with a internal