Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/item_func.h: Auto merged sql/item_sum.h: Auto merged sql/sql_udf.h: Auto merged
2025-08-08 11:22:35 +03:00 · 2005-05-09 12:16:59 +02:00
parent 12a3eb4dc8 61b5eb0d99
commit a91c804054
34 changed files with 54 additions and 32 deletions
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -33,6 +33,9 @@ else
  esac
 fi

+cpu_flag=""
+cpu_flag_obs=""
+
 case "$cpu_family--$model_name" in
  Alpha*EV6*)
    cpu_flag="ev6";
@@ -40,11 +43,21 @@ case "$cpu_family--$model_name" in
  *Xeon*)
    cpu_flag="nocona";
    ;;
+  *Pentium*4*Mobile*CPU*)
+    cpu_flag="pentium4m";
+  ;;
  *Pentium*4*CPU*)
    cpu_flag="pentium4";
    ;;
+  *Pentium*III*Mobile*CPU*)
+    cpu_flag="pentium3m";
+  ;;
+  *Pentium*III*CPU*)
+    cpu_flag="pentium3";
+  ;;
  *Athlon*64*)
    cpu_flag="athlon64";
+    cpu_flag_obs="athlon";
    ;;
  *Athlon*)
    cpu_flag="athlon";
@@ -84,6 +97,9 @@ case "$cc_ver--$cc_verno" in
    check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"
    ;;
  *GCC*)
+    # Fix for older compiler versions
+    if test -z "$cpu_flag_obs"; then
+      cpu_flag=$cpu_flag_obs;
    check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"
    ;;
  *)
--- 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) && defined(__GNUC__) && (__GNUC__ < 3)
+#define USE_PRAGMA_INTERFACE
+#endif
+
 #if defined(i386) && !defined(__i386__)
 #define __i386__
 #endif
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- a/sql/ha_isam.h
+++ b/sql/ha_isam.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

--- a/sql/ha_isammrg.h
+++ b/sql/ha_isammrg.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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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