#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:
.bzrignore
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 '.bzrignore'
--- a/.bzrignore 2010-07-30 18:25:50 +0000
+++ b/.bzrignore 2010-08-16 15:07:53 +0000
@@ -3117,5 +3117,5 @@ sql/.empty
libmysqld/sql_bootstrap.cc
mysys/thr_lock
libmysqld/binlog.cc
-libmysqld/sql_alter_table.cc
+libmysqld/sql_alter.cc
libmysqld/sql_partition_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 15:07:53 +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 15:07:53 +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 15:07:53 +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 15:07:53 +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 15:07:53 +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 15:07:53 +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 15:07:53 +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 15:07:53 +0000
@@ -18,14 +18,14 @@
// check_one_table_access
#include "sql_table.h" // mysql_alter_table, etc.
#include "sql_lex.h" // Sql_statement
-#include "sql_alter_table.h" // Alter_table_statement
+#include "sql_alter.h" // Alter_table_statement
#include "sql_partition.h" // struct partition_info, etc.
#include "sql_handler.h" // mysql_ha_rm_tables
#include "sql_base.h" // open_and_lock_tables, etc
#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 15:07:53 +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"
Attachment: [text/bzr-bundle] bzr/mattias.jonsson@oracle.com-20100816150753-dth9jex7s8gxd73w.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk-bugfixing branch (mattias.jonsson:3209) | Mattias Jonsson | 16 Aug |
