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
3164 kevin.lewis@stripped 2010-07-12
WL#4034 - More changes to storage/infoschema/Makefile.am and
some cleanup
modified:
storage/infoschema/Makefile.am
storage/infoschema/table_character_sets.cc
storage/infoschema/table_collations.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"
Attachment: [text/bzr-bundle] bzr/kevin.lewis@oracle.com-20100712211345-icvc6oaq774txzdf.bundle
| Thread |
|---|
| • bzr push into mysql-next-mr branch (kevin.lewis:3164 to 3165) WL#4034 | kevin.lewis | 12 Jul |
