Commit ffe6fae3 authored by unknown's avatar unknown
Browse files

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 3d6e5fea 92a7c1ed

BUILD/check-cpu

+27 −3
Original line number Diff line number Diff line
@@ -5,9 +5,13 @@ 
#



check_cpu () {

  if test -r /proc/cpuinfo ; then

  CPUINFO=/proc/cpuinfo

  if test -n "$TEST_CPUINFO" ; then

    CPUINFO=$TEST_CPUINFO

  fi

  if test -r "$CPUINFO" -a "$CPUINFO" != " " ; then

    # on Linux (and others?) we can get detailed CPU information out of /proc

    cpuinfo="cat /proc/cpuinfo"

    cpuinfo="cat $CPUINFO"



    # detect CPU family

    cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
@@ -33,6 +37,7 @@ check_cpu () { 
    done

  else

    # Fallback when there is no /proc/cpuinfo

    CPUINFO=" "

    case "`uname -s`" in

      FreeBSD|OpenBSD)

        cpu_family=`uname -m`;
@@ -84,6 +89,18 @@ check_cpu () { 
    *Pentium*M*pro*)

      cpu_arg="pentium-m";

    ;;

    *Celeron\(R\)*\ M*)

      cpu_arg="pentium-m";

    ;;

    *Celeron*Coppermine*)

      cpu_arg="pentium3"

    ;;

    *Celeron\(R\)*)

      cpu_arg="pentium4"

    ;;

    *Celeron*)

      cpu_arg="pentium2";

    ;;

    *Athlon*64*)

      cpu_arg="athlon64";

      ;;
@@ -121,6 +138,13 @@ check_cpu () { 




  if test -z "$cpu_arg" ; then

    if test "$CPUINFO" != " " ; then

      # fallback to uname if necessary

      TEST_CPUINFO=" "

      check_cpu_cflags=""

      check_cpu

      return

    fi

    echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2

    check_cpu_cflags=""

    return

cmd-line-utils/readline/undo.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ _rl_fix_last_undo_of_type (type, start, end) 


  for (rl = rl_undo_list; rl; rl = rl->next)

    {

      if (rl->what == (uint) type)

      if (rl->what == (unsigned int) type)

	{

	  rl->start = start;

	  rl->end = end;

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -2524,9 +2524,9 @@ linked_client_targets="linked_libmysql_sources" 


if test "$THREAD_SAFE_CLIENT" = "no"

then

  sql_client_dirs="strings regex mysys extra libmysql client"

  sql_client_dirs="strings regex mysys dbug extra libmysql client"

else

  sql_client_dirs="strings regex mysys extra libmysql libmysql_r client"

  sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"

  linked_client_targets="$linked_client_targets linked_libmysql_r_sources"

  AC_CONFIG_FILES(libmysql_r/Makefile)

  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])

include/thr_lock.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ typedef struct st_thr_lock { 
  void (*get_status)(void*, int);	/* When one gets a lock */

  void (*copy_status)(void*,void*);

  void (*update_status)(void*);		/* Before release of write */

  void (*restore_status)(void*);         /* Before release of read */

  my_bool (*check_status)(void *);

} THR_LOCK;

myisam/mi_create.c

+7 −6
Original line number Diff line number Diff line
@@ -815,18 +815,19 @@ uint mi_get_pointer_length(ulonglong file_length, uint def) 
  if (file_length)				/* If not default */

  {

#ifdef NOT_YET_READY_FOR_8_BYTE_POINTERS

    if (file_length >= (longlong) 1 << 56)

    if (file_length >= ULL(1) << 56)

      def=8;

    else

#endif

    if (file_length >= (longlong) 1 << 48)

    if (file_length >= ULL(1) << 48)

      def=7;

    if (file_length >= (longlong) 1 << 40)

    else if (file_length >= ULL(1) << 40)

      def=6;

    else if (file_length >= (longlong) 1 << 32)

    else if (file_length >= ULL(1) << 32)

      def=5;

    else if (file_length >= (1L << 24))

    else if (file_length >= ULL(1) << 24)

      def=4;

    else if (file_length >= (1L << 16))

    else if (file_length >= ULL(1) << 16)

      def=3;

    else

      def=2;