Skip to content

M
MariaDB
Commit 0f8a4aac authored by unknown's avatar unknown
Browse files
Options

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
parents 9f88f48b 963626cd
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 32 deletions
BUILD/check-cpu
View file @ 0f8a4aac
...@@ -33,6 +33,9 @@ else ...@@ -33,6 +33,9 @@ else
esac esac
fi fi
cpu_flag=""
cpu_flag_obs=""
case "$cpu_family--$model_name" in case "$cpu_family--$model_name" in
Alpha*EV6*) Alpha*EV6*)
cpu_flag="ev6"; cpu_flag="ev6";
...@@ -40,11 +43,21 @@ case "$cpu_family--$model_name" in ...@@ -40,11 +43,21 @@ case "$cpu_family--$model_name" in
*Xeon*) *Xeon*)
cpu_flag="nocona"; cpu_flag="nocona";
;; ;;
*Pentium*4*Mobile*CPU*)
cpu_flag="pentium4m";
;;
*Pentium*4*CPU*) *Pentium*4*CPU*)
cpu_flag="pentium4"; cpu_flag="pentium4";
;; ;;
*Pentium*III*Mobile*CPU*)
cpu_flag="pentium3m";
;;
*Pentium*III*CPU*)
cpu_flag="pentium3";
;;
*Athlon*64*) *Athlon*64*)
cpu_flag="athlon64"; cpu_flag="athlon64";
cpu_flag_obs="athlon";
;; ;;
*Athlon*) *Athlon*)
cpu_flag="athlon"; cpu_flag="athlon";
...@@ -84,6 +97,9 @@ case "$cc_ver--$cc_verno" in ...@@ -84,6 +97,9 @@ case "$cc_ver--$cc_verno" in
check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag" check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"
;; ;;
*GCC*) *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" check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"
;; ;;
*) *)
......
include/my_global.h
View file @ 0f8a4aac
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
#define HAVE_ERRNO_AS_DEFINE #define HAVE_ERRNO_AS_DEFINE
#endif /* __CYGWIN__ */ #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__) #if defined(i386) && !defined(__i386__)
#define __i386__ #define __i386__
#endif #endif
......
include/raid.h
View file @ 0f8a4aac
...@@ -89,7 +89,7 @@ extern "C" { ...@@ -89,7 +89,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/examples/ha_archive.h
View file @ 0f8a4aac
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/examples/ha_example.h
View file @ 0f8a4aac
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
that you can implement. that you can implement.
*/ */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/field.h
View file @ 0f8a4aac
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
variables must declare the size_of() member function. variables must declare the size_of() member function.
*/ */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_berkeley.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_blackhole.h
View file @ 0f8a4aac
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_heap.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_innodb.h
View file @ 0f8a4aac
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
Innodb Innodb
*/ */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_isam.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_isammrg.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_myisam.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_myisammrg.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/ha_ndbcluster.h
View file @ 0f8a4aac
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* The class defining a handle to an NDB Cluster table */ /* The class defining a handle to an NDB Cluster table */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/handler.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* Definitions for parameters to do with handler-routines */ /* Definitions for parameters to do with handler-routines */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item_cmpfunc.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* compare and test functions */ /* compare and test functions */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item_func.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* Function items used by mysql */ /* Function items used by mysql */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item_geofunc.h
View file @ 0f8a4aac
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifdef HAVE_SPATIAL #ifdef HAVE_SPATIAL
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item_strfunc.h
View file @ 0f8a4aac
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
/* This file defines all string functions */ /* This file defines all string functions */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#error PRAGMA
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item_subselect.h
View file @ 0f8a4aac
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/* subselect Item */ /* subselect Item */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item_sum.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* classes for sum functions */ /* classes for sum functions */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/item_timefunc.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* Function items used by mysql */ /* Function items used by mysql */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/opt_range.h
View file @ 0f8a4aac
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef _opt_range_h #ifndef _opt_range_h
#define _opt_range_h #define _opt_range_h
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/procedure.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* When using sql procedures */ /* When using sql procedures */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/protocol.h
View file @ 0f8a4aac
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/set_var.h
View file @ 0f8a4aac
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/* Classes to support the SET command */ /* Classes to support the SET command */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/sql_class.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* Classes in mysql */ /* Classes in mysql */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/sql_list.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/sql_select.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* classes to use when handling where clause */ /* classes to use when handling where clause */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/sql_string.h
View file @ 0f8a4aac
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/* This file is originally from the mysql distribution. Coded by monty */ /* This file is originally from the mysql distribution. Coded by monty */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
......
sql/sql_udf.h
View file @ 0f8a4aac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/* This file defines structures needed by udf functions */ /* This file defines structures needed by udf functions */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface #pragma interface
#endif #endif
......
sql/tztime.h
View file @ 0f8a4aac
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class interface */ #pragma interface /* gcc class interface */
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7