Merge

include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
  merge
ndb/test/run-test/Makefile.am:
  merge
sql/mysql_priv.h:
  merge from 4.1
sql/table.cc:
  Merge from 4.1

1 files changed, 17 insertions, 0 deletions

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index ce106e5a603..dfdf96d6b29 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -33,6 +33,9 @@ else
   esac
 fi
 
+cpu_flag=""
+cpu_flag_old=""
+
 case "$cpu_family--$model_name" in
   Alpha*EV6*)
     cpu_flag="ev6";
@@ -40,11 +43,21 @@ case "$cpu_family--$model_name" in
   *Xeon*)
     cpu_flag="nocona";
     ;;
+  *Pentium*4*Mobile*CPU*)
+    cpu_flag="pentium4m";
+  ;;
   *Pentium*4*CPU*)
     cpu_flag="pentium4";
     ;;
+  *Pentium*III*Mobile*CPU*)
+    cpu_flag="pentium3m";
+  ;;
+  *Pentium*III*CPU*)
+    cpu_flag="pentium3";
+  ;;
   *Athlon*64*)
     cpu_flag="athlon64";
+    cpu_flag_old="athlon";
     ;;
   *Athlon*)
     cpu_flag="athlon";
@@ -84,6 +97,10 @@ case "$cc_ver--$cc_verno" in
     check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"
     ;;
   *GCC*)
+    # Fix for older compiler versions
+    if test -n "$cpu_flag_old"; then
+      cpu_flag="$cpu_flag_old"
+    fi
     check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"
     ;;
   *)