From: Tor Didriksen Date: March 22 2011 11:44am Subject: bzr commit into mysql-trunk branch (tor.didriksen:3307) List-Archive: http://lists.mysql.com/commits/133504 Message-Id: <20110322114449.AB4323770@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7637880984741903074==" --===============7637880984741903074== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/trunk-pragma-interface/ based on revid:alfranio.correia@stripped 3307 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 === 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 #include #include === 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-09 20:54:55 +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 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 #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 #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 #include "rpl_constants.h" === modified file 'sql/opt_range.cc' --- a/sql/opt_range.cc 2011-03-17 11:48:04 +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 2010-12-17 12:58:04 +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 /* 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 #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 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 2010-12-14 15:12:13 +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-17 12:45:19 +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 #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 #include #include === 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 #include === 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 #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 #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 #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 -#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 /* === 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 === 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 // 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 === 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 === 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). --===============7637880984741903074== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # l41mwl56kdq2rwmc # target_branch: file:///export/home/didrik/repo/trunk-pragma-\ # interface/ # testament_sha1: 5644ba112071f9aaefdd51352e41fd02ee6dff0b # timestamp: 2011-03-22 12:44:49 +0100 # base_revision_id: alfranio.correia@stripped\ # k7j6khi9up8lmedy # # Begin bundle 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 zWsXVzbmTBa9Oby4v8XckU4UJCorza8A --===============7637880984741903074==--