bk commit into 5.0 tree (gkodinov:1.2235)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-08 11:59:10+03:00, gkodinov@stripped +1 -0
  Fix for check_cpu to work correctly on MacOSX/Intel.

  BUILD/check-cpu@stripped, 2006-08-08 11:59:03+03:00, gkodinov@stripped +4 -1
    Fix for check_cpu to work correctly on MacOSX/Intel.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	macbook.local
# Root:	/Users/kgeorge/mysql/work/check_cpu-5.0-opt

--- 1.13/BUILD/check-cpu	2006-08-08 11:59:29 +03:00
+++ 1.14/BUILD/check-cpu	2006-08-08 11:59:29 +03:00
@@ -93,6 +93,9 @@ case "$cpu_family--$model_name" in
   *Opteron*)
     cpu_arg="opteron";
     ;;
+  *i386*i486*)
+    cpu_arg="pentium-m";
+    ;;
 
   # Intel ia64
   *Itanium*)
@@ -131,7 +134,7 @@ else
 fi
 
 cc_ver=`$cc --version | sed 1q`
-cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`
+cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`
 
 case "$cc_ver--$cc_verno" in
   *GCC*)