Commit fcf18772 authored by unknown's avatar unknown
Browse files

Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1 

into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0


BitKeeper/etc/logging_ok:
  auto-union
parents 39f8776f 9a8e31a4

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

+1 −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