3317 Tor Didriksen 2011-03-22
Bug 11886774 - 59611 REMOVE THE PRAGMA INTERFACE/IMPLEMENTATION DECLARATIONS
Remove obsolete pragma interface/implementation and associated ifdefs/macros.
modified:
client/sql_string.cc
client/sql_string.h
include/my_global.h
sql/debug_sync.h
sql/field.cc
sql/field.h
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_cond.cc
sql/ha_ndbcluster_cond.h
sql/handler.cc
sql/handler.h
sql/hash_filo.cc
sql/hash_filo.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_func.cc
sql/item_func.h
sql/item_geofunc.cc
sql/item_geofunc.h
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.cc
sql/item_subselect.h
sql/item_sum.cc
sql/item_sum.h
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log_event.cc
sql/log_event.h
sql/opt_range.cc
sql/opt_range.h
sql/partition_info.cc
sql/partition_info.h
sql/procedure.cc
sql/procedure.h
sql/protocol.cc
sql/protocol.h
sql/records.cc
sql/records.h
sql/scheduler.cc
sql/scheduler.h
sql/set_var.cc
sql/set_var.h
sql/sp_cache.cc
sql/sp_cache.h
sql/sp_head.cc
sql/sp_head.h
sql/sp_pcontext.cc
sql/sp_pcontext.h
sql/sp_rcontext.cc
sql/sp_rcontext.h
sql/sql_analyse.cc
sql/sql_analyse.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_crypt.cc
sql/sql_crypt.h
sql/sql_cursor.cc
sql/sql_cursor.h
sql/sql_join_cache.cc
sql/sql_list.cc
sql/sql_list.h
sql/sql_select.cc
sql/sql_select.h
sql/sql_string.cc
sql/sql_string.h
sql/sql_udf.cc
sql/sql_udf.h
sql/transaction.cc
sql/transaction.h
sql/tztime.cc
sql/tztime.h
storage/archive/ha_archive.cc
storage/archive/ha_archive.h
storage/blackhole/ha_blackhole.cc
storage/blackhole/ha_blackhole.h
storage/csv/ha_tina.cc
storage/csv/transparent_file.cc
storage/example/ha_example.cc
storage/example/ha_example.h
storage/federated/ha_federated.cc
storage/federated/ha_federated.h
storage/heap/ha_heap.cc
storage/heap/ha_heap.h
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
storage/perfschema/ha_perfschema.h
3316 Luis Soares 2011-03-23 [merge]
Automerged bzr bundle attached in the bug report!
modified:
mysql-test/suite/rpl/r/rpl_grant.result
mysql-test/suite/rpl/t/rpl_grant.test
sql/sql_acl.cc
=== modified file 'client/sql_string.cc'
--- a/client/sql_string.cc 2011-03-09 20:54:55 +0000
+++ b/client/sql_string.cc 2011-03-22 11:44:40 +0000
@@ -15,10 +15,6 @@
/* This file is originally from the mysql distribution. Coded by monty */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include <my_global.h>
#include <my_sys.h>
#include <m_string.h>
=== modified file 'client/sql_string.h'
--- a/client/sql_string.h 2011-03-09 20:54:55 +0000
+++ b/client/sql_string.h 2011-03-22 11:44:40 +0000
@@ -18,10 +18,6 @@
/* This file is originally from the mysql distribution. Coded by monty */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
class String;
int sortcmp(const String *a,const String *b, const CHARSET_INFO *cs);
String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
=== modified file 'include/my_global.h'
--- a/include/my_global.h 2011-03-22 12:57:52 +0000
+++ b/include/my_global.h 2011-03-22 11:44:40 +0000
@@ -46,11 +46,6 @@
#define HAVE_ERRNO_AS_DEFINE
#endif /* __CYGWIN__ */
-/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#define USE_PRAGMA_INTERFACE
-#endif
-
#if defined(__OpenBSD__) && (OpenBSD >= 200411)
#define HAVE_ERRNO_AS_DEFINE
#endif
=== modified file 'sql/debug_sync.h'
--- a/sql/debug_sync.h 2010-07-02 02:58:51 +0000
+++ b/sql/debug_sync.h 2011-03-22 11:44:40 +0000
@@ -22,10 +22,6 @@
Declarations for the Debug Sync Facility. See debug_sync.cc for details.
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include <my_global.h>
class THD;
=== modified file 'sql/field.cc'
--- a/sql/field.cc 2011-03-17 09:43:28 +0000
+++ b/sql/field.cc 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
This file implements classes defined in field.h
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "sql_select.h"
#include "rpl_rli.h" // Pull in Relay_log_info
=== modified file 'sql/field.h'
--- a/sql/field.h 2011-03-09 20:54:55 +0000
+++ b/sql/field.h 2011-03-22 11:44:40 +0000
@@ -16,10 +16,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "mysqld.h" /* system_charset_info */
#include "table.h" /* TABLE */
#include "sql_string.h" /* String */
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2010-11-18 16:34:56 +0000
+++ b/sql/ha_ndbcluster.cc 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
MySQL and NDB Cluster
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "unireg.h" // REQUIRED: for other includes
#include "sql_table.h" // build_table_filename,
=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h 2010-07-13 17:29:44 +0000
+++ b/sql/ha_ndbcluster.h 2011-03-22 11:44:40 +0000
@@ -23,10 +23,6 @@
/* The class defining a handle to an NDB Cluster table */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/* Blob tables and events are internal to NDB and must never be accessed */
#define IS_NDB_BLOB_PREFIX(A) is_prefix(A, "NDB$BLOB")
=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc 2011-02-21 11:33:20 +0000
+++ b/sql/ha_ndbcluster_cond.cc 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
This file defines the NDB Cluster handler engine_condition_pushdown
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "sql_class.h" // set_var.h: THD
#include "my_global.h" // WITH_*
=== modified file 'sql/ha_ndbcluster_cond.h'
--- a/sql/ha_ndbcluster_cond.h 2010-07-13 17:29:44 +0000
+++ b/sql/ha_ndbcluster_cond.h 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
the NDB Cluster handler
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/*
It is necessary to include set_var.h instead of item.h because there
are dependencies on include order for set_var.h and item.h. This
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc 2011-03-08 19:14:42 +0000
+++ b/sql/handler.cc 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
Handler-calling-functions
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "unireg.h"
#include "rpl_handler.h"
=== modified file 'sql/handler.h'
--- a/sql/handler.h 2011-03-09 20:54:55 +0000
+++ b/sql/handler.h 2011-03-22 11:44:40 +0000
@@ -18,10 +18,6 @@
/* Definitions for parameters to do with handler-routines */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "sql_const.h"
#include "mysqld.h" /* server_id */
#include "sql_plugin.h" /* plugin_ref, st_plugin_int, plugin */
=== modified file 'sql/hash_filo.cc'
--- a/sql/hash_filo.cc 2010-07-02 18:15:21 +0000
+++ b/sql/hash_filo.cc 2011-03-22 11:44:40 +0000
@@ -19,9 +19,5 @@
** to usage.
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "hash_filo.h"
=== modified file 'sql/hash_filo.h'
--- a/sql/hash_filo.h 2010-07-02 02:58:51 +0000
+++ b/sql/hash_filo.h 2011-03-22 11:44:40 +0000
@@ -22,10 +22,6 @@
#ifndef HASH_FILO_H
#define HASH_FILO_H
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class interface */
-#endif
-
#include "hash.h" /* my_hash_get_key, my_hash_free_key, HASH */
#include "m_string.h" /* bzero */
#include "mysqld.h" /* key_hash_filo_lock */
=== modified file 'sql/item.cc'
--- a/sql/item.cc 2011-03-17 09:47:50 +0000
+++ b/sql/item.cc 2011-03-22 11:44:40 +0000
@@ -14,9 +14,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_priv.h"
#include "unireg.h" // REQUIRED: for other includes
=== modified file 'sql/item.h'
--- a/sql/item.h 2011-03-17 09:47:50 +0000
+++ b/sql/item.h 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "sql_priv.h" /* STRING_BUFFER_USUAL_SIZE */
#include "unireg.h"
#include "sql_const.h" /* RAND_TABLE_BIT, MAX_FIELD_NAME */
=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc 2011-03-17 11:33:17 +0000
+++ b/sql/item_cmpfunc.cc 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
This file defines all compare functions
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include <m_ctype.h>
#include "sql_select.h"
=== modified file 'sql/item_cmpfunc.h'
--- a/sql/item_cmpfunc.h 2011-03-09 20:54:55 +0000
+++ b/sql/item_cmpfunc.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* compare and test functions */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "thr_malloc.h" /* sql_calloc */
#include "item_func.h" /* Item_int_func, Item_bool_func */
#include "my_regex.h"
=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc 2011-03-17 11:33:17 +0000
+++ b/sql/item_func.cc 2011-03-22 11:44:40 +0000
@@ -20,10 +20,6 @@
This file defines all numerical functions
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_priv.h"
/*
=== modified file 'sql/item_func.h'
--- a/sql/item_func.h 2011-03-17 11:48:04 +0000
+++ b/sql/item_func.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* Function items used by mysql */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#ifdef HAVE_IEEEFP_H
extern "C" /* Bug in BSDI include file */
{
=== modified file 'sql/item_geofunc.cc'
--- a/sql/item_geofunc.cc 2010-10-28 09:54:31 +0000
+++ b/sql/item_geofunc.cc 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
This file defines all spatial functions
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
/*
It is necessary to include set_var.h instead of item.h because there
=== modified file 'sql/item_geofunc.h'
--- a/sql/item_geofunc.h 2011-03-08 19:14:42 +0000
+++ b/sql/item_geofunc.h 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
#ifdef HAVE_SPATIAL
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "gcalc_slicescan.h"
class Item_geometry_func: public Item_str_func
=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc 2011-03-10 08:23:14 +0000
+++ b/sql/item_strfunc.cc 2011-03-22 11:44:40 +0000
@@ -25,10 +25,6 @@
(This shouldn't be needed)
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
/* May include caustic 3rd-party defs. Use early, so it can override nothing. */
#include "sha2.h"
#include "my_global.h" // HAVE_*
=== modified file 'sql/item_strfunc.h'
--- a/sql/item_strfunc.h 2011-03-10 08:23:14 +0000
+++ b/sql/item_strfunc.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* This file defines all string functions */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
class MY_LOCALE;
class Item_str_func :public Item_func
=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc 2011-03-17 09:47:50 +0000
+++ b/sql/item_subselect.cc 2011-03-22 11:44:40 +0000
@@ -24,10 +24,6 @@
methods (sql_select.h/sql_select.cc)
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
/*
It is necessary to include set_var.h instead of item.h because there
=== modified file 'sql/item_subselect.h'
--- a/sql/item_subselect.h 2011-03-17 07:40:26 +0000
+++ b/sql/item_subselect.h 2011-03-22 11:44:40 +0000
@@ -18,10 +18,6 @@
/* subselect Item */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
class st_select_lex;
class st_select_lex_unit;
class JOIN;
=== modified file 'sql/item_sum.cc'
--- a/sql/item_sum.cc 2011-03-17 09:47:50 +0000
+++ b/sql/item_sum.cc 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
Sum functions (COUNT, MIN...)
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "sql_select.h"
=== modified file 'sql/item_sum.h'
--- a/sql/item_sum.h 2011-03-09 20:54:55 +0000
+++ b/sql/item_sum.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* classes for sum functions */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include <my_tree.h>
#include "sql_udf.h" /* udf_handler */
=== modified file 'sql/item_timefunc.cc'
--- a/sql/item_timefunc.cc 2011-03-17 11:11:39 +0000
+++ b/sql/item_timefunc.cc 2011-03-22 11:44:40 +0000
@@ -24,10 +24,6 @@
Move month and days to language files
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
/*
It is necessary to include set_var.h instead of item.h because there
=== modified file 'sql/item_timefunc.h'
--- a/sql/item_timefunc.h 2011-03-11 09:35:38 +0000
+++ b/sql/item_timefunc.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* Function items used by mysql */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
class MY_LOCALE;
enum date_time_format_types
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc 2011-03-14 17:09:16 +0000
+++ b/sql/log_event.cc 2011-03-22 11:44:40 +0000
@@ -20,10 +20,6 @@
#else
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "unireg.h"
#include "my_global.h" // REQUIRED by log_event.h > m_string.h > my_bitmap.h
=== modified file 'sql/log_event.h'
--- a/sql/log_event.h 2011-03-14 17:55:26 +0000
+++ b/sql/log_event.h 2011-03-22 11:44:40 +0000
@@ -28,10 +28,6 @@
#ifndef _log_event_h
#define _log_event_h
-#if defined(USE_PRAGMA_INTERFACE) && defined(MYSQL_SERVER)
-#pragma interface /* gcc class implementation */
-#endif
-
#include <my_bitmap.h>
#include "rpl_constants.h"
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc 2011-03-23 09:52:24 +0000
+++ b/sql/opt_range.cc 2011-03-22 11:44:40 +0000
@@ -103,10 +103,6 @@
subject and may omit some details.
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "key.h" // is_key_used, key_copy, key_cmp, key_restore
#include "sql_parse.h" // check_stack_overrun
=== modified file 'sql/opt_range.h'
--- a/sql/opt_range.h 2011-03-23 09:52:24 +0000
+++ b/sql/opt_range.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
#ifndef _opt_range_h
#define _opt_range_h
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "thr_malloc.h" /* sql_memdup */
#include "records.h" /* READ_RECORD */
#include "queues.h" /* QUEUE */
=== modified file 'sql/partition_info.cc'
--- a/sql/partition_info.cc 2011-02-09 22:35:46 +0000
+++ b/sql/partition_info.cc 2011-03-22 11:44:40 +0000
@@ -15,10 +15,6 @@
/* Some general useful functions */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation
-#endif
-
#include "sql_priv.h"
// Required to get server definitions for mysql/plugin.h right
#include "sql_plugin.h"
=== modified file 'sql/partition_info.h'
--- a/sql/partition_info.h 2011-02-09 22:35:46 +0000
+++ b/sql/partition_info.h 2011-03-22 11:44:40 +0000
@@ -16,10 +16,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "partition_element.h"
class partition_info;
=== modified file 'sql/procedure.cc'
--- a/sql/procedure.cc 2010-07-02 18:15:21 +0000
+++ b/sql/procedure.cc 2011-03-22 11:44:40 +0000
@@ -16,10 +16,6 @@
/* Procedures (functions with changes output of select) */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "procedure.h"
#include "sql_analyse.h" // Includes procedure
=== modified file 'sql/procedure.h'
--- a/sql/procedure.h 2011-03-09 20:54:55 +0000
+++ b/sql/procedure.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* When using sql procedures */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/*
It is necessary to include set_var.h instead of item.h because there
are dependencies on include order for set_var.h and item.h. This
=== modified file 'sql/protocol.cc'
--- a/sql/protocol.cc 2011-03-09 20:54:55 +0000
+++ b/sql/protocol.cc 2011-03-22 11:44:40 +0000
@@ -20,10 +20,6 @@
The actual communction is handled by the net_xxx functions in net_serv.cc
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "unireg.h" // REQUIRED: for other includes
#include "protocol.h"
=== modified file 'sql/protocol.h'
--- a/sql/protocol.h 2011-03-09 20:54:55 +0000
+++ b/sql/protocol.h 2011-03-22 11:44:40 +0000
@@ -16,10 +16,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "sql_error.h"
#include "my_decimal.h" /* my_decimal */
=== modified file 'sql/records.cc'
--- a/sql/records.cc 2010-11-23 11:04:47 +0000
+++ b/sql/records.cc 2011-03-22 11:44:40 +0000
@@ -13,10 +13,6 @@
along with this program; if not, write to the Free Software Foundation,
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma implementation /* gcc class implementation */
-#endif
-
/**
@file
=== modified file 'sql/records.h'
--- a/sql/records.h 2010-07-13 17:29:44 +0000
+++ b/sql/records.h 2011-03-22 11:44:40 +0000
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software Foundation,
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
#include <my_global.h> /* for uint typedefs */
struct st_join_table;
=== modified file 'sql/scheduler.cc'
--- a/sql/scheduler.cc 2010-09-01 13:05:01 +0000
+++ b/sql/scheduler.cc 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
Implementation for the thread scheduler
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma implementation
-#endif
-
#include <sql_priv.h>
#include "unireg.h" // REQUIRED: for other includes
#include "scheduler.h"
=== modified file 'sql/scheduler.h'
--- a/sql/scheduler.h 2010-10-08 12:57:46 +0000
+++ b/sql/scheduler.h 2011-03-22 11:44:40 +0000
@@ -20,10 +20,6 @@
Classes for the thread scheduler
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface
-#endif
-
class THD;
/* Functions used when manipulating threads */
=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc 2011-03-15 13:03:22 +0000
+++ b/sql/set_var.cc 2011-03-22 11:44:40 +0000
@@ -13,10 +13,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation
-#endif
-
/* variable declarations are in sys_vars.cc now !!! */
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
=== modified file 'sql/set_var.h'
--- a/sql/set_var.h 2011-03-09 20:54:55 +0000
+++ b/sql/set_var.h 2011-03-22 11:44:40 +0000
@@ -20,10 +20,6 @@
"public" interface to sys_var - server configuration variables.
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include <my_getopt.h>
class sys_var;
=== modified file 'sql/sp_cache.cc'
--- a/sql/sp_cache.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sp_cache.cc 2011-03-22 11:44:40 +0000
@@ -15,9 +15,6 @@
#include "sql_priv.h"
#include "unireg.h"
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation
-#endif
#include "sp_cache.h"
#include "sp_head.h"
=== modified file 'sql/sp_cache.h'
--- a/sql/sp_cache.h 2010-07-02 18:15:21 +0000
+++ b/sql/sp_cache.h 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
#ifndef _SP_CACHE_H_
#define _SP_CACHE_H_
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "my_global.h" /* ulong */
/*
=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc 2011-03-09 20:54:55 +0000
+++ b/sql/sp_head.cc 2011-03-22 11:44:40 +0000
@@ -27,9 +27,6 @@
#include "sql_array.h" // Dynamic_array
#include "log_event.h" // append_query_string, Query_log_event
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation
-#endif
#include "sp_head.h"
#include "sp.h"
#include "sp_pcontext.h"
=== modified file 'sql/sp_head.h'
--- a/sql/sp_head.h 2011-03-09 20:54:55 +0000
+++ b/sql/sp_head.h 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
#ifndef _SP_HEAD_H_
#define _SP_HEAD_H_
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/*
It is necessary to include set_var.h instead of item.h because there
are dependencies on include order for set_var.h and item.h. This
=== modified file 'sql/sp_pcontext.cc'
--- a/sql/sp_pcontext.cc 2010-11-05 22:14:29 +0000
+++ b/sql/sp_pcontext.cc 2011-03-22 11:44:40 +0000
@@ -15,10 +15,6 @@
#include "sql_priv.h"
#include "unireg.h"
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation
-#endif
-
#include "sp_pcontext.h"
#include "sp_head.h"
=== modified file 'sql/sp_pcontext.h'
--- a/sql/sp_pcontext.h 2010-11-05 22:14:29 +0000
+++ b/sql/sp_pcontext.h 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
#ifndef _SP_PCONTEXT_H_
#define _SP_PCONTEXT_H_
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "sql_string.h" // LEX_STRING
#include "mysql_com.h" // enum_field_types
#include "field.h" // Create_field
=== modified file 'sql/sp_rcontext.cc'
--- a/sql/sp_rcontext.cc 2010-07-30 15:30:30 +0000
+++ b/sql/sp_rcontext.cc 2011-03-22 11:44:40 +0000
@@ -15,10 +15,6 @@
#include "sql_priv.h"
#include "unireg.h"
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation
-#endif
-
#include "mysql.h"
#include "sp_head.h"
#include "sql_cursor.h"
=== modified file 'sql/sp_rcontext.h'
--- a/sql/sp_rcontext.h 2010-11-13 15:11:39 +0000
+++ b/sql/sp_rcontext.h 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
#ifndef _SP_RCONTEXT_H_
#define _SP_RCONTEXT_H_
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "sql_class.h" // select_result_interceptor
struct sp_cond_type;
=== modified file 'sql/sql_analyse.cc'
--- a/sql/sql_analyse.cc 2011-03-14 18:11:41 +0000
+++ b/sql/sql_analyse.cc 2011-03-22 11:44:40 +0000
@@ -22,10 +22,6 @@
** - type set is out of optimization yet
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#define MYSQL_LEX 1
#include "sql_priv.h"
=== modified file 'sql/sql_analyse.h'
--- a/sql/sql_analyse.h 2010-07-02 18:15:21 +0000
+++ b/sql/sql_analyse.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* Analyse database */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "procedure.h" /* Procedure */
#define my_thd_charset default_charset_info
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc 2011-03-09 20:54:55 +0000
+++ b/sql/sql_class.cc 2011-03-22 11:44:40 +0000
@@ -21,10 +21,6 @@
**
*****************************************************************************/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_priv.h"
#include "unireg.h" // REQUIRED: for other includes
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h 2011-03-11 09:35:38 +0000
+++ b/sql/sql_class.h 2011-03-22 11:44:40 +0000
@@ -18,10 +18,6 @@
/* Classes in mysql */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#ifdef MYSQL_SERVER
#include "unireg.h" // REQUIRED: for other includes
=== modified file 'sql/sql_crypt.cc'
--- a/sql/sql_crypt.cc 2010-07-02 18:15:21 +0000
+++ b/sql/sql_crypt.cc 2011-03-22 11:44:40 +0000
@@ -22,10 +22,6 @@
needs something like 'ssh'.
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "sql_crypt.h"
#include "password.h"
=== modified file 'sql/sql_crypt.h'
--- a/sql/sql_crypt.h 2010-07-02 18:15:21 +0000
+++ b/sql/sql_crypt.h 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "sql_list.h" /* Sql_alloc */
#include "mysql_com.h" /* rand_struct */
=== modified file 'sql/sql_cursor.cc'
--- a/sql/sql_cursor.cc 2011-03-22 12:06:52 +0000
+++ b/sql/sql_cursor.cc 2011-03-22 11:44:40 +0000
@@ -13,10 +13,6 @@
along with this program; if not, write to the Free Software Foundation,
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation /* gcc class implementation */
-#endif
-
#include "sql_priv.h"
#include "unireg.h"
#include "sql_cursor.h"
=== modified file 'sql/sql_cursor.h'
--- a/sql/sql_cursor.h 2010-07-27 15:01:56 +0000
+++ b/sql/sql_cursor.h 2011-03-22 11:44:40 +0000
@@ -16,10 +16,6 @@
#ifndef _sql_cursor_h_
#define _sql_cursor_h_
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class interface */
-#endif
-
#include "sql_class.h" /* Query_arena */
class JOIN;
=== modified file 'sql/sql_join_cache.cc'
--- a/sql/sql_join_cache.cc 2010-09-02 07:34:10 +0000
+++ b/sql/sql_join_cache.cc 2011-03-22 11:44:40 +0000
@@ -23,10 +23,6 @@
@{
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "sql_select.h"
#include "key.h"
=== modified file 'sql/sql_list.cc'
--- a/sql/sql_list.cc 2010-07-02 18:15:21 +0000
+++ b/sql/sql_list.cc 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "unireg.h"
#include "sql_list.h"
=== modified file 'sql/sql_list.h'
--- a/sql/sql_list.h 2010-07-16 21:00:50 +0000
+++ b/sql/sql_list.h 2011-03-22 11:44:40 +0000
@@ -20,10 +20,6 @@
#include "m_string.h" /* for TRASH */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
void *sql_alloc(size_t);
#include "my_sys.h" /* alloc_root, TRASH, MY_WME,
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc 2011-03-23 09:52:24 +0000
+++ b/sql/sql_select.cc 2011-03-22 11:44:40 +0000
@@ -24,10 +24,6 @@
@{
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "unireg.h"
#include "sql_select.h"
=== modified file 'sql/sql_select.h'
--- a/sql/sql_select.h 2011-03-17 09:43:28 +0000
+++ b/sql/sql_select.h 2011-03-22 11:44:40 +0000
@@ -24,10 +24,6 @@
classes to use when handling where clause
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "procedure.h"
#include <myisam.h>
#include "sql_array.h" /* Array */
=== modified file 'sql/sql_string.cc'
--- a/sql/sql_string.cc 2011-03-09 20:54:55 +0000
+++ b/sql/sql_string.cc 2011-03-22 11:44:40 +0000
@@ -15,10 +15,6 @@
/* This file is originally from the mysql distribution. Coded by monty */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include <my_global.h>
#include <my_sys.h>
#include <m_string.h>
=== modified file 'sql/sql_string.h'
--- a/sql/sql_string.h 2011-03-09 20:54:55 +0000
+++ b/sql/sql_string.h 2011-03-22 11:44:40 +0000
@@ -18,10 +18,6 @@
/* This file is originally from the mysql distribution. Coded by monty */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "m_ctype.h" /* my_charset_bin */
#include "my_sys.h" /* alloc_root, my_free, my_realloc */
#include "m_string.h" /* TRASH */
=== modified file 'sql/sql_udf.cc'
--- a/sql/sql_udf.cc 2011-01-10 16:27:45 +0000
+++ b/sql/sql_udf.cc 2011-03-22 11:44:40 +0000
@@ -27,10 +27,6 @@
dynamic functions, so this shouldn't be a real problem.
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "unireg.h"
#include "sql_base.h" // close_mysql_tables
=== modified file 'sql/sql_udf.h'
--- a/sql/sql_udf.h 2010-07-02 18:15:21 +0000
+++ b/sql/sql_udf.h 2011-03-22 11:44:40 +0000
@@ -19,10 +19,6 @@
/* This file defines structures needed by udf functions */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface
-#endif
-
enum Item_udftype {UDFTYPE_FUNCTION=1,UDFTYPE_AGGREGATE};
typedef void (*Udf_func_clear)(UDF_INIT *, uchar *, uchar *);
=== modified file 'sql/transaction.cc'
--- a/sql/transaction.cc 2011-02-14 14:15:28 +0000
+++ b/sql/transaction.cc 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "transaction.h"
#include "rpl_handler.h"
=== modified file 'sql/transaction.h'
--- a/sql/transaction.h 2010-07-02 02:58:51 +0000
+++ b/sql/transaction.h 2011-03-22 11:44:40 +0000
@@ -16,10 +16,6 @@
#ifndef TRANSACTION_H
#define TRANSACTION_H
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include <my_global.h>
#include <m_string.h>
=== modified file 'sql/tztime.cc'
--- a/sql/tztime.cc 2010-10-02 19:12:58 +0000
+++ b/sql/tztime.cc 2011-03-22 11:44:40 +0000
@@ -24,10 +24,6 @@
it creates unsolved link dependencies on some platforms.
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include <my_global.h>
#if !defined(TZINFO2SQL) && !defined(TESTTIME)
#include "sql_priv.h"
=== modified file 'sql/tztime.h'
--- a/sql/tztime.h 2010-07-02 18:15:21 +0000
+++ b/sql/tztime.h 2011-03-22 11:44:40 +0000
@@ -17,10 +17,6 @@
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class interface */
-#endif
-
#include "my_time.h" /* my_time_t */
#include "mysql_time.h" /* MYSQL_TIME */
#include "sql_list.h" /* Sql_alloc */
=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc 2011-03-03 09:22:17 +0000
+++ b/storage/archive/ha_archive.cc 2011-03-22 11:44:40 +0000
@@ -13,10 +13,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "probes_mysql.h"
#include "sql_class.h" // SSV
=== modified file 'storage/archive/ha_archive.h'
--- a/storage/archive/ha_archive.h 2011-03-08 09:21:39 +0000
+++ b/storage/archive/ha_archive.h 2011-03-22 11:44:40 +0000
@@ -13,10 +13,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include <zlib.h>
#include "azlib.h"
=== modified file 'storage/blackhole/ha_blackhole.cc'
--- a/storage/blackhole/ha_blackhole.cc 2010-10-06 14:34:28 +0000
+++ b/storage/blackhole/ha_blackhole.cc 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#define MYSQL_SERVER 1
#include "sql_priv.h"
#include "unireg.h"
=== modified file 'storage/blackhole/ha_blackhole.h'
--- a/storage/blackhole/ha_blackhole.h 2010-10-06 14:34:28 +0000
+++ b/storage/blackhole/ha_blackhole.h 2011-03-22 11:44:40 +0000
@@ -13,10 +13,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "thr_lock.h" /* THR_LOCK */
#include "handler.h" /* handler */
#include "table.h" /* TABLE_SHARE */
=== modified file 'storage/csv/ha_tina.cc'
--- a/storage/csv/ha_tina.cc 2010-07-29 12:33:56 +0000
+++ b/storage/csv/ha_tina.cc 2011-03-22 11:44:40 +0000
@@ -41,10 +41,6 @@ TODO:
-Brian
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "my_global.h"
#include "sql_priv.h"
#include "sql_class.h" // SSV
=== modified file 'storage/csv/transparent_file.cc'
--- a/storage/csv/transparent_file.cc 2010-07-08 21:20:08 +0000
+++ b/storage/csv/transparent_file.cc 2011-03-22 11:44:40 +0000
@@ -13,10 +13,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include <mysql/psi/mysql_file.h>
#include "transparent_file.h"
=== modified file 'storage/example/ha_example.cc'
--- a/storage/example/ha_example.cc 2010-10-06 14:34:28 +0000
+++ b/storage/example/ha_example.cc 2011-03-22 11:44:40 +0000
@@ -87,10 +87,6 @@
-Brian
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "sql_priv.h"
#include "sql_class.h" // MYSQL_HANDLERTON_INTERFACE_VERSION
#include "ha_example.h"
=== modified file 'storage/example/ha_example.h'
--- a/storage/example/ha_example.h 2010-10-07 12:47:15 +0000
+++ b/storage/example/ha_example.h 2011-03-22 11:44:40 +0000
@@ -31,10 +31,6 @@
/sql/handler.h and /storage/example/ha_example.cc
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "my_global.h" /* ulonglong */
#include "thr_lock.h" /* THR_LOCK, THR_LOCK_DATA */
#include "handler.h" /* handler */
=== modified file 'storage/federated/ha_federated.cc'
--- a/storage/federated/ha_federated.cc 2010-11-05 22:14:29 +0000
+++ b/storage/federated/ha_federated.cc 2011-03-22 11:44:40 +0000
@@ -378,10 +378,6 @@
#include "sql_analyse.h" // append_escaped
#include <mysql/plugin.h>
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include "ha_federated.h"
#include "probes_mysql.h"
=== modified file 'storage/federated/ha_federated.h'
--- a/storage/federated/ha_federated.h 2011-03-08 08:41:57 +0000
+++ b/storage/federated/ha_federated.h 2011-03-22 11:44:40 +0000
@@ -20,10 +20,6 @@
that you can implement.
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include <mysql.h>
/*
=== modified file 'storage/heap/ha_heap.cc'
--- a/storage/heap/ha_heap.cc 2010-10-06 14:34:28 +0000
+++ b/storage/heap/ha_heap.cc 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#define MYSQL_SERVER 1
#include "sql_priv.h"
#include "probes_mysql.h"
=== modified file 'storage/heap/ha_heap.h'
--- a/storage/heap/ha_heap.h 2010-10-06 14:34:28 +0000
+++ b/storage/heap/ha_heap.h 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/* class for the the heap handler */
#include <heap.h>
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc 2011-03-17 11:33:17 +0000
+++ b/storage/innobase/handler/ha_innodb.cc 2011-03-22 11:44:40 +0000
@@ -29,10 +29,6 @@ You should have received a copy of the G
this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#include <sql_table.h> // explain_filename, nz2, EXPLAIN_PARTITIONS_AS_COMMENT,
// EXPLAIN_FILENAME_MAX_EXTRA_LENGTH
=== modified file 'storage/innobase/handler/ha_innodb.h'
--- a/storage/innobase/handler/ha_innodb.h 2010-10-27 14:46:44 +0000
+++ b/storage/innobase/handler/ha_innodb.h 2011-03-22 11:44:40 +0000
@@ -23,10 +23,6 @@ Place, Suite 330, Boston, MA 02111-1307
Innodb
*/
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
#include "dict0stats.h"
/* Structure defines translation table between mysql index and innodb
=== modified file 'storage/myisam/ha_myisam.cc'
--- a/storage/myisam/ha_myisam.cc 2011-03-08 09:21:39 +0000
+++ b/storage/myisam/ha_myisam.cc 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#define MYSQL_SERVER 1
#include "sql_priv.h"
#include "probes_mysql.h"
=== modified file 'storage/myisam/ha_myisam.h'
--- a/storage/myisam/ha_myisam.h 2010-10-21 11:34:17 +0000
+++ b/storage/myisam/ha_myisam.h 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/* class for the the myisam handler */
#include <myisam.h>
=== modified file 'storage/myisammrg/ha_myisammrg.cc'
--- a/storage/myisammrg/ha_myisammrg.cc 2010-10-20 19:02:59 +0000
+++ b/storage/myisammrg/ha_myisammrg.cc 2011-03-22 11:44:40 +0000
@@ -85,10 +85,6 @@
They stay with the open table until its final close.
*/
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
#define MYSQL_SERVER 1
#include "sql_priv.h"
#include "unireg.h"
=== modified file 'storage/myisammrg/ha_myisammrg.h'
--- a/storage/myisammrg/ha_myisammrg.h 2010-10-06 14:34:28 +0000
+++ b/storage/myisammrg/ha_myisammrg.h 2011-03-22 11:44:40 +0000
@@ -14,10 +14,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/* class for the the myisam merge handler */
#include <myisammrg.h>
=== modified file 'storage/perfschema/ha_perfschema.h'
--- a/storage/perfschema/ha_perfschema.h 2010-12-01 18:46:51 +0000
+++ b/storage/perfschema/ha_perfschema.h 2011-03-22 11:44:40 +0000
@@ -18,10 +18,6 @@
#include "handler.h" /* class handler */
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
/**
@file storage/perfschema/ha_perfschema.h
Performance schema storage engine (declarations).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (tor.didriksen:3316 to 3317) | Tor Didriksen | 24 Mar |
