From: Mattias Jonsson Date: August 16 2010 2:29pm Subject: bzr commit into mysql-5.5-bugfixing branch (mattias.jonsson:3182) List-Archive: http://lists.mysql.com/commits/115815 Message-Id: <201008161430.o7GDoO58010342@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8640333721803032074==" --===============8640333721803032074== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mattiasj/mysql-bzr/topush-5.5-bugfixing/ based on revid:mattias.jonsson@stripped 3182 Mattias Jonsson 2010-08-16 [merge] merge 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:58:38 +0000 +++ b/libmysqld/CMakeLists.txt 2010-08-16 14:27:25 +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:58:38 +0000 +++ b/sql/CMakeLists.txt 2010-08-16 14:27:25 +0000 @@ -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}) === 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:58:38 +0000 +++ b/sql/sql_parse.cc 2010-08-16 14:27:25 +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:58:38 +0000 +++ b/sql/sql_yacc.yy 2010-08-16 14:27:25 +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" --===============8640333721803032074== 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\ # 7m7wm1k2nqrvkrxt # target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-\ # bugfixing/ # testament_sha1: e5a57b9ab8b3db016f09c2032b5a2f7fb2d00ab2 # timestamp: 2010-08-16 16:30:19 +0200 # source_branch: file:///Users/mattiasj/mysql-bzr/b53676-5.5-bf/ # base_revision_id: mattias.jonsson@stripped\ # hgloze1wt92lwymd # # Begin bundle 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 --===============8640333721803032074==--