Commit 9f8a30f5 authored by unknown's avatar unknown
Browse files

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

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


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents 248eb4a9 b7aa21df

BUILD/check-cpu

+12 −0
Original line number Diff line number Diff line
@@ -19,6 +19,18 @@ if test -r /proc/cpuinfo ; then 
  if test -z "$model_name" ; then

    model_name=`uname -m`

  fi

else

  # Fallback when there is no /proc/cpuinfo

  case "`uname -s`" in

    FreeBSD)

      cpu_family=`uname -m`;

      model_name=`sysctl -b hw.model`

      ;;

    *)

      cpu_family=`uname -m`;

      model_name="unknown";

      ;;

  esac

fi



case "$cpu_family--$model_name" in

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ ahlentz@co3064164-a.rochd1.qld.optusnet.com.au 
akishkin@work.mysql.com

anjuta@arthur.local

antony@ltantony.dsl-verizon.net

antony@ltantony.mysql.com

antony@ltantony.rdg.cyberkinetica.com

antony@ltantony.rdg.cyberkinetica.homeunix.net

arjen@bitbike.com
@@ -186,6 +187,7 @@ mysqldev@build.mysql2.com 
mysqldev@melody.local

mysqldev@mysql.com

mysqldev@o2k.irixworld.net

ndbdev@dl145b.mysql.com

ndbdev@eel.hemma.oreland.se

ndbdev@ndbmaster.mysql.com

ndbdev@shark.