Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work1-testcases-20061

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work


BUILD/check-cpu:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged

1 files changed, 27 insertions, 3 deletions

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 042e6b9856d..9edde51402f 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -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";
       ;;
@@ -120,7 +137,14 @@ check_cpu () {
   esac
 
 
-  if test -z "$cpu_arg"; then
+  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