From: Mattias Jonsson Date: August 16 2010 2:43pm Subject: bzr commit into mysql-trunk-bugfixing branch (mattias.jonsson:3209) List-Archive: http://lists.mysql.com/commits/115818 Message-Id: <201008161445.o7F9fVbG030780@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9140280814937350747==" --===============9140280814937350747== 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-trunk-bugfixing/ based on revid:mattias.jonsson@stripped 3209 Mattias Jonsson 2010-08-16 [merge] manual 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 14:22:16 +0000 +++ b/libmysqld/CMakeLists.txt 2010-08-16 14:41:36 +0000 @@ -65,7 +65,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 @@ -81,7 +81,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 ../sql/binlog.cc === modified file 'libmysqld/Makefile.am' --- a/libmysqld/Makefile.am 2010-08-16 14:22:16 +0000 +++ b/libmysqld/Makefile.am 2010-08-16 14:41:36 +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 \ @@ -79,7 +79,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 \ sql_bootstrap.cc \ binlog.cc rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \ === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2010-08-16 14:22:16 +0000 +++ b/sql/CMakeLists.txt 2010-08-16 14:41:36 +0000 @@ -76,7 +76,7 @@ SET (SQL_SOURCE transaction.cc sys_vars.cc rpl_handler.cc sql_truncate.cc datadict.cc sql_partition_admin.cc - sql_table_maintenance.cc sql_alter_table.cc + sql_admin.cc sql_alter.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE}) === modified file 'sql/Makefile.am' --- a/sql/Makefile.am 2010-08-16 14:22:16 +0000 +++ b/sql/Makefile.am 2010-08-16 14:41:36 +0000 @@ -128,11 +128,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 \ @@ -150,7 +150,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 \ @@ -174,7 +174,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler. sql_servers.cc event_parse_data.cc sql_signal.cc \ mdl.cc transaction.cc sql_audit.cc \ sha2.cc \ - sql_alter_table.cc \ + sql_alter.cc \ sql_partition_admin.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 14:22:16 +0000 +++ b/sql/sql_alter.cc 2010-08-16 14:41:36 +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 14:22:16 +0000 +++ b/sql/sql_lex.h 2010-08-16 14:41:36 +0000 @@ -935,7 +935,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 14:22:16 +0000 +++ b/sql/sql_parse.cc 2010-08-16 14:41:36 +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 14:22:16 +0000 +++ b/sql/sql_partition_admin.cc 2010-08-16 14:41:36 +0000 @@ -25,7 +25,7 @@ #include "debug_sync.h" // DEBUG_SYNC #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 14:22:16 +0000 +++ b/sql/sql_yacc.yy 2010-08-16 14:41:36 +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" --===============9140280814937350747== 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\ # vzw17fsdjrp7d7x1 # target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\ # bugfixing/ # testament_sha1: 0e8539739089eb630dadf4a94594ffdc873dfe67 # timestamp: 2010-08-16 16:43:50 +0200 # source_branch: file:///Users/mattiasj/clones/bzrroot/b52815-mysql-\ # trunk-bf/ # base_revision_id: mattias.jonsson@stripped\ # ctdwy2mapcjbevsz # # Begin bundle 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 --===============9140280814937350747==--