Commit 05aa70c4 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
parents affe9f8c 6f1db965

BUILD/check-cpu

+8 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ if test -r /proc/cpuinfo ; then 
  fi



  # parse CPU flags

  for flag in `$cpuinfo | grep 'flags' | sed -e 's/^flags.*: //'`; do 

  for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do 

	eval cpu_flag_$flag=yes

  done

else
@@ -52,7 +52,6 @@ fi 
# detect CPU shortname as used by gcc options 

# this list is not complete, feel free to add further entries

cpu_arg=""



case "$cpu_family--$model_name" in

  # DEC Alpha

  Alpha*EV6*)
@@ -99,8 +98,12 @@ case "$cpu_family--$model_name" in 
    ;;



  #

  *ppc*)

    cpu_arg='powerpc'

    ;;

 

  *powerpc*)

    cpu_arg=`echo $model_name | sed -e"s/ppc//g"`

    cpu_arg='powerpc'

    ;;



  # unknown

client/sql_string.cc

+1 −2
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


/* This file is originally from the mysql distribution. Coded by monty */



#include <my_global.h>



#ifdef USE_PRAGMA_IMPLEMENTATION

#pragma implementation				// gcc: Class implementation

#endif



#include <my_global.h>

#include <my_sys.h>

#include <m_string.h>

#include <m_ctype.h>

configure.in

+12 −1
Original line number Diff line number Diff line
@@ -1766,12 +1766,23 @@ if test "$ac_cv_sizeof_off_t" -eq 0 
then

  AC_MSG_ERROR("MySQL needs a off_t type.")

fi



# do we need #pragma interface/#pragma implementation ?

# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin

AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)

# instead of trying to match SYSTEM_TYPE and CC_VERSION (that doesn't

# follow any standard), we'll use well-defined preprocessor macros:

AC_TRY_CPP([

#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

#error USE_PRAGMA_IMPLEMENTATION

#endif

],AC_MSG_RESULT(no) ,AC_MSG_RESULT(yes) ; CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION")



# This always gives a warning. Ignore it unless you are cross compiling

AC_C_BIGENDIAN

#---START: Used in for client configure

# Check base type of last arg to accept

MYSQL_TYPE_ACCEPT



#---END:

# Figure out what type of struct rlimit to use with setrlimit

MYSQL_TYPE_STRUCT_RLIMIT

include/my_global.h

+2 −14
Original line number Diff line number Diff line
@@ -43,16 +43,11 @@ 
#define HAVE_ERRNO_AS_DEFINE

#endif /* __CYGWIN__ */



/* Determine when to use "#pragma interface" */

#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */

#ifdef USE_PRAGMA_IMPLEMENTATION

#define USE_PRAGMA_INTERFACE

#endif



/* Determine when to use "#pragma implementation" */

#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

#define USE_PRAGMA_IMPLEMENTATION

#endif



#if defined(i386) && !defined(__i386__)

#define __i386__

#endif
@@ -306,13 +301,6 @@ C_MODE_END 
#include <alloca.h>

#endif

#ifdef HAVE_ATOMIC_ADD

#define __SMP__

#ifdef HAVE_LINUX_CONFIG_H

#include <linux/config.h>	/* May define CONFIG_SMP */

#endif

#ifndef CONFIG_SMP

#define CONFIG_SMP

#endif

#if defined(__ia64__)

#define new my_arg_new

#define need_to_restore_new 1

mysql-test/lib/mtr_misc.pl

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ sub mtr_full_hostname () { 
  if ( $hostname !~ /\./ )

  {

    my $address=   gethostbyname($hostname)

      or die "Couldn't resolve $hostname : $!";

      or mtr_error("Couldn't resolve $hostname : $!");

    my $fullname=  gethostbyaddr($address, AF_INET);

    $hostname= $fullname if $fullname; 

  }