Merge neptunus.(none):/home/msvensson/mysql/bug10241

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


include/my_global.h:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.h:
  Auto merged
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/procedure.h:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/tztime.h:
  Auto merged

31 files changed, 36 insertions, 30 deletions

diff --git a/include/my_global.h b/include/my_global.h
index f051ed2918e..bd3fcbb6b07 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -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
diff --git a/include/raid.h b/include/raid.h
index 04c54393e54..c840afcbaab 100644
--- a/include/raid.h
+++ b/include/raid.h
@@ -89,7 +89,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/examples/ha_archive.h b/sql/examples/ha_archive.h
index e2c40c880a4..c68462be1ab 100644
--- a/sql/examples/ha_archive.h
+++ b/sql/examples/ha_archive.h
@@ -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
 
diff --git a/sql/examples/ha_example.h b/sql/examples/ha_example.h
index 3c6ce4220ee..ae72e5bb275 100644
--- a/sql/examples/ha_example.h
+++ b/sql/examples/ha_example.h
@@ -21,7 +21,7 @@
   that you can implement.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/field.h b/sql/field.h
index 853b5dd13ff..edc3286ae8d 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -20,7 +20,7 @@
   variables must declare the size_of() member function.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index 1d49c3be0e9..f6376939445 100644
--- a/sql/ha_berkeley.h
+++ b/sql/ha_berkeley.h
@@ -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
 
diff --git a/sql/ha_blackhole.h b/sql/ha_blackhole.h
index b6f924e94b9..84a386e17f8 100644
--- a/sql/ha_blackhole.h
+++ b/sql/ha_blackhole.h
@@ -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
 
diff --git a/sql/ha_heap.h b/sql/ha_heap.h
index fb526888b01..5d50270ec5b 100644
--- a/sql/ha_heap.h
+++ b/sql/ha_heap.h
@@ -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
 
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index 6c412a889b2..bcbc38650b3 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -21,7 +21,7 @@
   Innodb
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h
index 7e14a3b7941..bbd9721f8e2 100644
--- a/sql/ha_myisam.h
+++ b/sql/ha_myisam.h
@@ -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
 
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h
index 6058c32c805..3bc9c11d4be 100644
--- a/sql/ha_myisammrg.h
+++ b/sql/ha_myisammrg.h
@@ -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
 
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 81b2873d9dd..8012f16e42e 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -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
 
diff --git a/sql/handler.h b/sql/handler.h
index 5e25f038c36..11f8dd0b4d7 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -17,7 +17,7 @@
 
 /* Definitions for parameters to do with handler-routines */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item.h b/sql/item.h
index 697194e2878..0e15e539067 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -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
 
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 96101f7b691..a929d509723 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -17,7 +17,7 @@
 
 /* compare and test functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item_func.h b/sql/item_func.h
index 57faa05ce23..cdc03a166c5 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -17,7 +17,7 @@
 
 /* Function items used by mysql */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index e19036cc982..c45fb88a48a 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -19,7 +19,7 @@
 
 #ifdef HAVE_SPATIAL
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index eec81f953fb..d7c77829cfc 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -17,7 +17,8 @@
 
 /* This file defines all string functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
+#error PRAGMA
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index bdea5c5efee..84935429353 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -16,7 +16,7 @@
 
 /* subselect Item */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item_sum.h b/sql/item_sum.h
index fb72fed1c5e..b263cbfa0a7 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -17,7 +17,7 @@
 
 /* classes for sum functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index ab511ae2883..c8fb2b39836 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -17,7 +17,7 @@
 
 /* Function items used by mysql */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 71680b5a1fc..8d365262334 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -20,7 +20,7 @@
 #ifndef _opt_range_h
 #define _opt_range_h
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/procedure.h b/sql/procedure.h
index 5d0dccbcd5e..aceadd10883 100644
--- a/sql/procedure.h
+++ b/sql/procedure.h
@@ -17,7 +17,7 @@
 
 /* When using sql procedures */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface				/* gcc class implementation */
 #endif
 
diff --git a/sql/protocol.h b/sql/protocol.h
index de379db541b..01331ef64ba 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -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
 
diff --git a/sql/set_var.h b/sql/set_var.h
index 585f6df3547..32f45187124 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -16,7 +16,7 @@
 
 /* Classes to support the SET command */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 4393da6df2a..211648e63f7 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -17,7 +17,7 @@
 
 /* Classes in mysql */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/sql_list.h b/sql/sql_list.h
index 55d9d668bdd..ac0f7f7012a 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -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
 
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 82efb62f7a3..a27fbc60856 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -17,7 +17,7 @@
 
 /* classes to use when handling where clause */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 7ece9885040..c05305d9265 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -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
 
diff --git a/sql/sql_udf.h b/sql/sql_udf.h
index 51ea6d4d627..2a7c06e1891 100644
--- a/sql/sql_udf.h
+++ b/sql/sql_udf.h
@@ -17,7 +17,7 @@
 
 /* This file defines structures needed by udf functions */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface
 #endif
 
diff --git a/sql/tztime.h b/sql/tztime.h
index 777e521d761..cbf359e8961 100644
--- a/sql/tztime.h
+++ b/sql/tztime.h
@@ -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