From: Mattias Jonsson Date: August 16 2010 2:25pm Subject: bzr commit into mysql-5.5-bugfixing branch (mattias.jonsson:3180) List-Archive: http://lists.mysql.com/commits/115814 Message-Id: <201008161426.o7FLSoCH023961@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3781194957459889486==" --===============3781194957459889486== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mattiasj/mysql-bzr/b49907-5.5-bf/ based on revid:mattias.jonsson@stripped 3180 Mattias Jonsson 2010-08-16 Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_admin renamed: sql/sql_alter_table.cc => sql/sql_alter.cc sql/sql_alter_table.h => sql/sql_alter.h sql/sql_table_maintenance.cc => sql/sql_admin.cc sql/sql_table_maintenance.h => sql/sql_admin.h modified: libmysqld/CMakeLists.txt libmysqld/Makefile.am sql/CMakeLists.txt sql/Makefile.am sql/sql_lex.h sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_yacc.yy sql/sql_alter.cc sql/sql_admin.cc === modified file 'libmysqld/CMakeLists.txt' --- a/libmysqld/CMakeLists.txt 2010-08-16 12:53:30 +0000 +++ b/libmysqld/CMakeLists.txt 2010-08-16 14:25:23 +0000 @@ -64,7 +64,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc l ../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 l ../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 === modified file 'libmysqld/Makefile.am' --- a/libmysqld/Makefile.am 2010-08-16 12:53:30 +0000 +++ b/libmysqld/Makefile.am 2010-08-16 14:25:23 +0000 @@ -63,7 +63,7 @@ sqlsources = derror.cc field.cc field_co 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_co 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 === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2010-08-16 12:53:30 +0000 +++ b/sql/CMakeLists.txt 2010-08-16 14:25:23 +0000 @@ -72,8 +72,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}) === modified file 'sql/Makefile.am' --- a/sql/Makefile.am 2010-08-16 12:53:30 +0000 +++ b/sql/Makefile.am 2010-08-16 14:25:23 +0000 @@ -122,11 +122,11 @@ noinst_HEADERS = item.h item_func.h item 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. 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. 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 === renamed file 'sql/sql_table_maintenance.cc' => 'sql/sql_admin.cc' --- a/sql/sql_table_maintenance.cc 2010-08-16 12:53:30 +0000 +++ b/sql/sql_admin.cc 2010-08-16 14:25:23 +0000 @@ -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) === renamed file 'sql/sql_table_maintenance.h' => 'sql/sql_admin.h' === renamed file 'sql/sql_alter_table.cc' => 'sql/sql_alter.cc' --- a/sql/sql_alter_table.cc 2010-08-16 12:53:30 +0000 +++ b/sql/sql_alter.cc 2010-08-16 14:25:23 +0000 @@ -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) { === renamed file 'sql/sql_alter_table.h' => 'sql/sql_alter.h' === modified file 'sql/sql_lex.h' --- a/sql/sql_lex.h 2010-08-16 12:53:30 +0000 +++ b/sql/sql_lex.h 2010-08-16 14:25:23 +0000 @@ -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 === modified file 'sql/sql_parse.cc' --- a/sql/sql_parse.cc 2010-08-16 12:53:30 +0000 +++ b/sql/sql_parse.cc 2010-08-16 14:25:23 +0000 @@ -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, === modified file 'sql/sql_partition_admin.cc' --- a/sql/sql_partition_admin.cc 2010-08-16 12:53:30 +0000 +++ b/sql/sql_partition_admin.cc 2010-08-16 14:25:23 +0000 @@ -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 === modified file 'sql/sql_yacc.yy' --- a/sql/sql_yacc.yy 2010-08-16 12:53:30 +0000 +++ b/sql/sql_yacc.yy 2010-08-16 14:25:23 +0000 @@ -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" --===============3781194957459889486== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mattias.jonsson@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@stripped\ # zc1cbi6fr8v0bi9y # target_branch: file:///Users/mattiasj/mysql-bzr/b49907-5.5-bf/ # testament_sha1: d575d690afe41d418fb451d580775ea542152eec # timestamp: 2010-08-16 16:25:39 +0200 # base_revision_id: mattias.jonsson@stripped\ # dkgcurwzlm2zus2w # # Begin bundle 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 --===============3781194957459889486==--