Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt

into  moonbone.local:/work/tmp_merge-5.1-mysql


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

1 files changed, 5 insertions, 1 deletions

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 583e31ee389..2543b540d2a 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -93,6 +93,10 @@ case "$cpu_family--$model_name" in
   *Opteron*)
     cpu_arg="opteron";
     ;;
+  # MacOSX / Intel  
+  *i386*i486*)
+    cpu_arg="pentium-m";
+    ;;
 
   # Intel ia64
   *Itanium*)
@@ -131,7 +135,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*)