Merge mysql.com:/home/bkroot/mysql-5.1 into mysql.com:/home/bk/mysql-5.1

BitKeeper/etc/logging_ok:
  auto-union

BUILD/check-cpu

@@ -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

@@ -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