From: kevin.lewis Date: July 12 2010 9:13pm Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3165) WL#4034 List-Archive: http://lists.mysql.com/commits/113409 Message-Id: <20100712211358.30BDB3D7655@kevin-lewis-macbook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1900562275==" --===============1900562275== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-mr-wl4034/ based on revid:kevin.lewis@stripped 3165 kevin.lewis@stripped 2010-07-12 WL#4034 - No longer explicitly define MYSQL_SERVER since it is now in Makefile.am modified: storage/infoschema/ha_infoschema.cc storage/infoschema/infoschema_base.cc storage/infoschema/table_character_sets.cc storage/infoschema/table_co_ch_set_app.cc storage/infoschema/table_collations.cc storage/infoschema/table_column_privileges.cc storage/infoschema/table_engines.cc storage/infoschema/table_global_status.cc storage/infoschema/table_global_variables.cc storage/infoschema/table_open_tables.cc storage/infoschema/table_partitions.cc storage/infoschema/table_plugin_schema.cc storage/infoschema/table_plugins.cc storage/infoschema/table_proclist.cc storage/infoschema/table_session_status.cc storage/infoschema/table_session_variables.cc storage/infoschema/table_status.cc storage/infoschema/table_table_names.cc storage/infoschema/table_tables.cc storage/infoschema/table_triggers.cc storage/infoschema/table_variables.cc === modified file 'storage/infoschema/ha_infoschema.cc' --- a/storage/infoschema/ha_infoschema.cc 2010-07-09 19:03:58 +0000 +++ b/storage/infoschema/ha_infoschema.cc 2010-07-12 21:13:45 +0000 @@ -23,7 +23,6 @@ #pragma implementation // gcc: Class implementation #endif -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" #include "sql_acl.h" // wild_case_compare === modified file 'storage/infoschema/infoschema_base.cc' --- a/storage/infoschema/infoschema_base.cc 2010-07-09 19:03:58 +0000 +++ b/storage/infoschema/infoschema_base.cc 2010-07-12 21:13:45 +0000 @@ -19,8 +19,6 @@ @brief Base class for all implementations of an infoschema table. */ -#define MYSQL_SERVER 1 - #include "my_global.h" #include "sql_base.h" #include "infoschema_base.h" === modified file 'storage/infoschema/table_character_sets.cc' --- a/storage/infoschema/table_character_sets.cc 2010-07-12 20:31:48 +0000 +++ b/storage/infoschema/table_character_sets.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_character_sets.cc @brief CHARACTER_SETS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_co_ch_set_app.cc' --- a/storage/infoschema/table_co_ch_set_app.cc 2010-06-09 18:42:52 +0000 +++ b/storage/infoschema/table_co_ch_set_app.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_co_ch_set_app.cc @brief COLLATION_CHARACTER_SET_APPLICABILITY table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_collations.cc' --- a/storage/infoschema/table_collations.cc 2010-07-12 20:31:48 +0000 +++ b/storage/infoschema/table_collations.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_collations.cc @brief COLLATIONS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_column_privileges.cc' --- a/storage/infoschema/table_column_privileges.cc 2010-06-14 17:27:51 +0000 +++ b/storage/infoschema/table_column_privileges.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_column_privileges.cc @brief COLUMN_PRIVILEGES table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_engines.cc' --- a/storage/infoschema/table_engines.cc 2010-06-09 18:42:52 +0000 +++ b/storage/infoschema/table_engines.cc 2010-07-12 21:13:45 +0000 @@ -18,8 +18,6 @@ @brief INFORMATION_SCHEMA.ENGINES table implementation. */ -#define MYSQL_SERVER 1 - #include "my_global.h" #include "sql_base.h" #include "sql_acl.h" // wild_case_compare === modified file 'storage/infoschema/table_global_status.cc' --- a/storage/infoschema/table_global_status.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_global_status.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_global_status.cc @brief GLOBAL_STATUS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_global_variables.cc' --- a/storage/infoschema/table_global_variables.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_global_variables.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_global_variables.cc @brief GLOBAL_VARIABLES table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_open_tables.cc' --- a/storage/infoschema/table_open_tables.cc 2010-06-09 18:42:52 +0000 +++ b/storage/infoschema/table_open_tables.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_open_tables.cc @brief OPEN_TABLES table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_partitions.cc' --- a/storage/infoschema/table_partitions.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_partitions.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_partitions.cc @brief PARTITIONS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_plugin_schema.cc' --- a/storage/infoschema/table_plugin_schema.cc 2010-06-14 17:27:51 +0000 +++ b/storage/infoschema/table_plugin_schema.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_plugin_schema.cc @brief Generic class for information schema tables declared by other plugins. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_plugins.cc' --- a/storage/infoschema/table_plugins.cc 2010-06-09 18:42:52 +0000 +++ b/storage/infoschema/table_plugins.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_plugins.cc @brief PLUGINS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_proclist.cc' --- a/storage/infoschema/table_proclist.cc 2010-06-09 18:42:52 +0000 +++ b/storage/infoschema/table_proclist.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_proclist.cc @brief PROCESSLISTS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_session_status.cc' --- a/storage/infoschema/table_session_status.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_session_status.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_session_status.cc @brief SESSION_STATUS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_session_variables.cc' --- a/storage/infoschema/table_session_variables.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_session_variables.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_session_variables.cc @brief SESSION_VARIABLES table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_status.cc' --- a/storage/infoschema/table_status.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_status.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_status.cc @brief STATUS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_table_names.cc' --- a/storage/infoschema/table_table_names.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_table_names.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_table_names.cc @brief TABLE_NAMES table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_tables.cc' --- a/storage/infoschema/table_tables.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_tables.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_tables.cc @brief TABLES table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_triggers.cc' --- a/storage/infoschema/table_triggers.cc 2010-07-02 19:23:41 +0000 +++ b/storage/infoschema/table_triggers.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_triggers.cc @brief TRIGGERS table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" === modified file 'storage/infoschema/table_variables.cc' --- a/storage/infoschema/table_variables.cc 2010-07-08 15:13:05 +0000 +++ b/storage/infoschema/table_variables.cc 2010-07-12 21:13:45 +0000 @@ -17,7 +17,6 @@ @file storage/infoschema/table_variables.cc @brief VARIABLES table implementation. */ -#define MYSQL_SERVER 1 #include "my_global.h" #include "sql_base.h" --===============1900562275== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/kevin.lewis@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@stripped # target_branch: file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-\ # mr-wl4034/ # testament_sha1: 7860d28a1827f971382e3660123166da9cef8003 # timestamp: 2010-07-12 16:13:58 -0500 # source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\ # mr/ # base_revision_id: kevin.lewis@stripped\ # 34yge500dz3h59sn # # Begin bundle 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 --===============1900562275==--