Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/my/mysql-4.1


BUILD/SETUP.sh:
  Auto merged

BUILD/SETUP.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 if ! test -f sql/mysqld.cc
 then
   echo "You must run this script from the MySQL top-level directory"
@@ -49,6 +51,7 @@ max_configs="$max_no_es_configs --with-embedded-server"
 alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet
 amd64_cflags="-DBIG_TABLES"
 pentium_cflags="-mcpu=pentiumpro"
+pentium64_cflags="-mcpu=nocona -m64"
 ppc_cflags="-mpowerpc -mcpu=powerpc"
 sparc_cflags=""
 

BUILD/compile-pentium64-debug

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$pentium64_cflags $debug_cflags"
+c_warnings="$c_warnings $debug_extra_warnings"
+cxx_warnings="$cxx_warnings $debug_extra_warnings"
+extra_configs="$pentium_configs $debug_configs $static_link"
+
+extra_configs="$extra_configs "
+
+. "$path/FINISH.sh"