mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Mattias Jonsson 2010-08-16 16:27:25 +02:00
commit d7cfada075
12 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmysqld/CMakeLists.txt
View file

@ -64,7 +64,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/sql_db.cc ../sql/sql_delete.cc ../sql/sql_derived.cc
../sql/sql_do.cc ../sql/sql_error.cc ../sql/sql_handler.cc
../sql/sql_help.cc ../sql/sql_insert.cc ../sql/datadict.cc
../sql/sql_table_maintenance.cc ../sql/sql_truncate.cc
../sql/sql_admin.cc ../sql/sql_truncate.cc
../sql/sql_lex.cc ../sql/keycaches.cc
../sql/sql_list.cc ../sql/sql_load.cc ../sql/sql_locale.cc
../sql/sql_binlog.cc ../sql/sql_manager.cc
@ -80,7 +80,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/sql_time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
../sql/partition_info.cc ../sql/sql_connect.cc
../sql/scheduler.cc ../sql/sql_audit.cc
../sql/sql_alter_table.cc ../sql/sql_partition_admin.cc
../sql/sql_alter.cc ../sql/sql_partition_admin.cc
../sql/event_parse_data.cc
../sql/sql_signal.cc ../sql/rpl_handler.cc
../sql/rpl_utility.cc

4
libmysqld/Makefile.am
View file

@ -63,7 +63,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
protocol.cc net_serv.cc opt_range.cc \
opt_sum.cc procedure.cc records.cc sql_acl.cc \
sql_load.cc discover.cc sql_locale.cc \
sql_profile.cc sql_table_maintenance.cc sql_truncate.cc datadict.cc \
sql_profile.cc sql_admin.cc sql_truncate.cc datadict.cc \
sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \
sql_lex.cc sql_list.cc sql_manager.cc \
@ -78,7 +78,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
debug_sync.cc sql_tablespace.cc transaction.cc \
rpl_injector.cc my_user.c partition_info.cc sql_alter_table.cc \
rpl_injector.cc my_user.c partition_info.cc sql_alter.cc \
sql_servers.cc event_parse_data.cc sql_signal.cc \
rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \
sql_partition_admin.cc

4
sql/CMakeLists.txt
View file

@ -71,8 +71,8 @@ SET (SQL_SOURCE
partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc
rpl_rli.cc rpl_mi.cc sql_servers.cc sql_audit.cc
sql_connect.cc scheduler.cc sql_partition_admin.cc
sql_profile.cc event_parse_data.cc sql_alter_table.cc
sql_signal.cc rpl_handler.cc mdl.cc sql_table_maintenance.cc
sql_profile.cc event_parse_data.cc sql_alter.cc
sql_signal.cc rpl_handler.cc mdl.cc sql_admin.cc
transaction.cc sys_vars.cc sql_truncate.cc datadict.cc
${GEN_SOURCES}
${MYSYS_LIBWRAP_SOURCE})

8
sql/Makefile.am
View file

@ -122,11 +122,11 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
sql_plugin.h authors.h event_parse_data.h \
event_data_objects.h event_scheduler.h \
sql_partition.h partition_info.h partition_element.h \
sql_audit.h sql_alter_table.h sql_partition_admin.h \
sql_audit.h sql_alter.h sql_partition_admin.h \
contributors.h sql_servers.h sql_signal.h records.h \
sql_prepare.h rpl_handler.h replication.h mdl.h \
sql_plist.h transaction.h sys_vars.h sql_truncate.h \
sql_table_maintenance.h datadict.h
sql_admin.h datadict.h
mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \
item.cc item_sum.cc item_buff.cc item_func.cc \
@ -143,7 +143,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \
datadict.cc sql_profile.cc \
sql_prepare.cc sql_error.cc sql_locale.cc \
sql_update.cc sql_delete.cc uniques.cc sql_do.cc \
procedure.cc sql_test.cc sql_table_maintenance.cc \
procedure.cc sql_test.cc sql_admin.cc \
sql_truncate.cc \
log.cc init.cc derror.cc sql_acl.cc \
unireg.cc des_key_file.cc \
@ -172,7 +172,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \
sql_builtin.cc sql_tablespace.cc partition_info.cc \
sql_servers.cc event_parse_data.cc sql_signal.cc \
rpl_handler.cc mdl.cc transaction.cc sql_audit.cc \
sql_alter_table.cc sql_partition_admin.cc sha2.cc
sql_alter.cc sql_partition_admin.cc sha2.cc
nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c

2
sql/sql_table_maintenance.cc → sql/sql_admin.cc
View file

@ -27,7 +27,7 @@
#include "sql_acl.h" // *_ACL
#include "sp.h" // Sroutine_hash_entry
#include "sql_parse.h" // check_table_access
#include "sql_table_maintenance.h"
#include "sql_admin.h"
static int send_check_errmsg(THD *thd, TABLE_LIST* table,
const char* operator_name, const char* errmsg)

0
sql/sql_table_maintenance.h → sql/sql_admin.h
View file

2
sql/sql_alter_table.cc → sql/sql_alter.cc
View file

@ -17,7 +17,7 @@
// check_merge_table_access
#include "sql_table.h" // mysql_alter_table,
// mysql_exchange_partition
#include "sql_alter_table.h"
#include "sql_alter.h"
bool Alter_table_statement::execute(THD *thd)
{

0
sql/sql_alter_table.h → sql/sql_alter.h
View file

2
sql/sql_lex.h
View file

@ -923,7 +923,7 @@ enum enum_alter_table_change_level
/**
Temporary hack to enable a class bound forward declaration
of the enum_alter_table_change_level enumeration. To be
removed once Alter_info is moved to the sql_alter_table.h
removed once Alter_info is moved to the sql_alter.h
header.
*/
class Alter_table_change_level

2
sql/sql_parse.cc
View file

@ -50,7 +50,7 @@
// mysql_backup_table,
// mysql_restore_table
#include "sql_truncate.h" // mysql_truncate_table
#include "sql_table_maintenance.h" // mysql_assign_to_keycache
#include "sql_admin.h" // mysql_assign_to_keycache
#include "sql_connect.h" // check_user,
// decrease_user_connections,
// thd_init_client_charset, check_mqh,

2
sql/sql_partition_admin.cc
View file

@ -18,7 +18,7 @@
#include "sql_lex.h" // Sql_statement
#include "sql_truncate.h" // mysql_truncate_table,
// Truncate_statement
#include "sql_table_maintenance.h" // Analyze/Check/.._table_statement
#include "sql_admin.h" // Analyze/Check/.._table_statement
#include "sql_partition_admin.h" // Alter_table_*_partition
#ifndef WITH_PARTITION_STORAGE_ENGINE

4
sql/sql_yacc.yy
View file

@ -51,9 +51,9 @@
#include "sp_pcontext.h"
#include "sp_rcontext.h"
#include "sp.h"
#include "sql_alter_table.h" // Alter_table*_statement
#include "sql_alter.h" // Alter_table*_statement
#include "sql_truncate.h" // Truncate_statement
#include "sql_table_maintenance.h" // Analyze/Check..._table_stmt
#include "sql_admin.h" // Analyze/Check..._table_stmt
#include "sql_partition_admin.h" // Alter_table_*_partition_stmt
#include "sql_signal.h"
#include "event_parse_data.h"