Commit a91c8040 authored by unknown's avatar unknown
Browse files

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 12a3eb4d 61b5eb0d

BUILD/check-cpu

+16 −0
Original line number Diff line number Diff line
@@ -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"

    ;;

  *)

include/my_global.h

+5 −0
Original line number Diff line number Diff line
@@ -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

include/raid.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ extern "C" { 
#ifdef __cplusplus

}



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif

sql/examples/ha_archive.h

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/examples/ha_example.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
  that you can implement.

*/



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif