MySQL Lists: internals: bk commit into 4.1 tree (msvensson:1.2222) BUG#10241

List:	Internals	« Previous Message Next Message »
From:	msvensson	Date:	May 4 2005 3:06pm
Subject:	bk commit into 4.1 tree (msvensson:1.2222) BUG#10241
View as plain text
Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2222 05/05/04 15:05:56 msvensson@neptunus.(none) +33 -0
  BUG#10241 cygwin port: invalid pragma interface directives
   - Introduce ifdefs so we can control when to use #pragma interface on cygwin

  sql/tztime.h
    1.8 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_udf.h
    1.8 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_string.h
    1.56 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_select.h
    1.75 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_list.h
    1.30 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_class.h
    1.278 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/set_var.h
    1.58 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/protocol.h
    1.22 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_IMPLEMENTATION

  sql/procedure.h
    1.17 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/opt_range.h
    1.37 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_timefunc.h
    1.52 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_sum.h
    1.79 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_subselect.h
    1.61 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_strfunc.h
    1.93 05/05/04 15:05:53 msvensson@neptunus.(none) +2 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_geofunc.h
    1.9 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_func.h
    1.123 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_cmpfunc.h
    1.106 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item.h
    1.178 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/handler.h
    1.138 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_ndbcluster.h
    1.53 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_myisammrg.h
    1.37 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_myisam.h
    1.64 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_isammrg.h
    1.23 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_isam.h
    1.29 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_innodb.h
    1.80 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_heap.h
    1.31 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_blackhole.h
    1.3 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_berkeley.h
    1.69 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/field.h
    1.128 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/examples/ha_example.h
    1.9 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/examples/ha_archive.h
    1.13 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  include/raid.h
    1.19 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  include/my_global.h
    1.85 05/05/04 15:05:53 msvensson@neptunus.(none) +5 -0
    Turn on use of #pragma implementation and #pragma interface if compiled with GCC and
platform != Cygwin

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug10241

--- 1.18/include/raid.h	2004-12-16 14:16:24 +01:00
+++ 1.19/include/raid.h	2005-05-04 15:05:53 +02:00
@@ -89,7 +89,7 @@
 #ifdef __cplusplus
 }
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.127/sql/field.h	2005-04-29 16:03:18 +02:00
+++ 1.128/sql/field.h	2005-05-04 15:05:53 +02:00
@@ -20,7 +20,7 @@
   variables must declare the size_of() member function.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.68/sql/ha_berkeley.h	2004-09-13 04:14:20 +02:00
+++ 1.69/sql/ha_berkeley.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.30/sql/ha_heap.h	2004-09-08 00:07:03 +02:00
+++ 1.31/sql/ha_heap.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.28/sql/ha_isam.h	2004-07-08 14:45:21 +02:00
+++ 1.29/sql/ha_isam.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.22/sql/ha_isammrg.h	2004-07-08 14:45:21 +02:00
+++ 1.23/sql/ha_isammrg.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.63/sql/ha_myisam.h	2005-02-04 15:23:58 +01:00
+++ 1.64/sql/ha_myisam.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.36/sql/ha_myisammrg.h	2004-12-27 13:01:59 +01:00
+++ 1.37/sql/ha_myisammrg.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.137/sql/handler.h	2005-04-14 03:25:28 +02:00
+++ 1.138/sql/handler.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* Definitions for parameters to do with handler-routines */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.177/sql/item.h	2005-04-29 16:03:19 +02:00
+++ 1.178/sql/item.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.105/sql/item_cmpfunc.h	2005-03-13 16:34:33 +01:00
+++ 1.106/sql/item_cmpfunc.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* compare and test functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.122/sql/item_func.h	2005-04-29 16:03:21 +02:00
+++ 1.123/sql/item_func.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* Function items used by mysql */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.92/sql/item_strfunc.h	2005-03-24 15:08:03 +01:00
+++ 1.93/sql/item_strfunc.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,8 @@
 
 /* This file defines all string functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
+#error PRAGMA
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.78/sql/item_sum.h	2005-02-22 11:51:20 +01:00
+++ 1.79/sql/item_sum.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* classes for sum functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.51/sql/item_timefunc.h	2005-01-26 20:24:59 +01:00
+++ 1.52/sql/item_timefunc.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* Function items used by mysql */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.36/sql/opt_range.h	2004-11-16 21:57:58 +01:00
+++ 1.37/sql/opt_range.h	2005-05-04 15:05:53 +02:00
@@ -20,7 +20,7 @@
 #ifndef _opt_range_h
 #define _opt_range_h
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.16/sql/procedure.h	2005-02-22 11:51:20 +01:00
+++ 1.17/sql/procedure.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* When using sql procedures */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface				/* gcc class implementation */
 #endif
 

--- 1.277/sql/sql_class.h	2005-02-12 20:58:51 +01:00
+++ 1.278/sql/sql_class.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* Classes in mysql */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.29/sql/sql_list.h	2005-02-15 01:55:37 +01:00
+++ 1.30/sql/sql_list.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.74/sql/sql_select.h	2005-04-18 03:21:41 +02:00
+++ 1.75/sql/sql_select.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* classes to use when handling where clause */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.55/sql/sql_string.h	2005-03-15 14:15:43 +01:00
+++ 1.56/sql/sql_string.h	2005-05-04 15:05:53 +02:00
@@ -16,7 +16,7 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.7/sql/sql_udf.h	2004-11-06 06:37:27 +01:00
+++ 1.8/sql/sql_udf.h	2005-05-04 15:05:53 +02:00
@@ -17,7 +17,7 @@
 
 /* This file defines structures needed by udf functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface
 #endif
 

--- 1.60/sql/item_subselect.h	2005-03-31 10:47:31 +02:00
+++ 1.61/sql/item_subselect.h	2005-05-04 15:05:53 +02:00
@@ -16,7 +16,7 @@
 
 /* subselect Item */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.12/sql/examples/ha_archive.h	2005-04-28 10:49:15 +02:00
+++ 1.13/sql/examples/ha_archive.h	2005-05-04 15:05:53 +02:00
@@ -14,7 +14,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.8/sql/examples/ha_example.h	2004-07-08 14:45:21 +02:00
+++ 1.9/sql/examples/ha_example.h	2005-05-04 15:05:53 +02:00
@@ -21,7 +21,7 @@
   that you can implement.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.2/sql/ha_blackhole.h	2005-03-25 01:07:54 +01:00
+++ 1.3/sql/ha_blackhole.h	2005-05-04 15:05:53 +02:00
@@ -14,7 +14,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.7/sql/tztime.h	2004-12-09 11:31:41 +01:00
+++ 1.8/sql/tztime.h	2005-05-04 15:05:53 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class interface */
 #endif
 

--- 1.52/sql/ha_ndbcluster.h	2005-04-27 18:17:17 +02:00
+++ 1.53/sql/ha_ndbcluster.h	2005-05-04 15:05:53 +02:00
@@ -21,7 +21,7 @@
 
 /* The class defining a handle to an NDB Cluster table */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface                       /* gcc class implementation */
 #endif
 

--- 1.79/sql/ha_innodb.h	2005-04-07 11:16:34 +02:00
+++ 1.80/sql/ha_innodb.h	2005-05-04 15:05:53 +02:00
@@ -21,7 +21,7 @@
   Innodb
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.84/include/my_global.h	2005-04-29 16:03:15 +02:00
+++ 1.85/include/my_global.h	2005-05-04 15:05:53 +02:00
@@ -43,6 +43,11 @@
 #define HAVE_ERRNO_AS_DEFINE
 #endif /* __CYGWIN__ */
 
+/* Determine when to use "#pragma interface" */
+#if !defined(__CYGWIN__) && !defined(__ICC) && (__GNUC__ < 3)
+#define USE_PRAGMA_INTERFACE
+#endif
+
 #if defined(i386) && !defined(__i386__)
 #define __i386__
 #endif

--- 1.21/sql/protocol.h	2004-11-02 19:13:23 +01:00
+++ 1.22/sql/protocol.h	2005-05-04 15:05:53 +02:00
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.57/sql/set_var.h	2005-02-17 12:04:00 +01:00
+++ 1.58/sql/set_var.h	2005-05-04 15:05:53 +02:00
@@ -16,7 +16,7 @@
 
 /* Classes to support the SET command */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.8/sql/item_geofunc.h	2004-09-22 19:36:50 +02:00
+++ 1.9/sql/item_geofunc.h	2005-05-04 15:05:53 +02:00
@@ -19,7 +19,7 @@
 
 #ifdef HAVE_SPATIAL
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
Thread
• bk commit into 4.1 tree (msvensson:1.2222) BUG#10241	msvensson	4 May