Merge mysql.com:/home/jimw/my/mysql-4.1-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/deleted/.del-compile-amd64-debug-max:
  Delete: BUILD/compile-amd64-debug-max
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-compile-amd64-max:
  Delete: BUILD/compile-amd64-max

BUILD/SETUP.sh

@@ -43,7 +43,13 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
 c_warnings="$global_warnings -Wunused"
 cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
 
+base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
+max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
+max_no_es_configs="$max_leave_isam_configs --without-isam"
+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"
@@ -58,9 +64,11 @@ reckless_cflags="-O3 -fomit-frame-pointer "
 debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"
 
 base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
+amd64_cxxflags="-DBIG_TABLES"
 
 base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"
 static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
+amd64_configs=""
 alpha_configs=""	# Not used yet
 pentium_configs=""
 sparc_configs=""

BUILD/compile-amd64-debug-max

 #! /bin/sh
 path=`dirname $0`
 . "$path/SETUP.sh"
-amd64_cflags="-DBIG_TABLES"
-amd64_cxx_flags="-DBIG_TABLES"
-amd64_configs=""
-base_cxxflags="$amd64_cxx_flags $base_cxxflags"
-extra_flags="$amd64_cflags $debug_cflags"
+extra_flags="$amd64_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$amd64_configs $debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$amd64_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-amd64-max

@@ -2,16 +2,7 @@
 
 path=`dirname $0`
 . "$path/SETUP.sh"
-amd64_cflags="-DBIG_TABLES"
-amd64_cxx_flags="-DBIG_TABLES"
-amd64_configs=""
-base_cxxflags="$amd64_cxx_flags $base_cxxflags"
-extra_flags="$amd64_cflags $fast_cflags -g"
-extra_configs="$amd64_configs"
-#strip=yes
-
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-        --with-embedded-server --enable-thread-safe-client \
-        --with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"
+extra_configs="$amd64_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-max

@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$pentium_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-max-no-embedded

@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-openssl --with-raid"
+extra_configs="$pentium_configs $debug_configs $max_no_es_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-max

@@ -3,12 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $fast_cflags -g"
-extra_configs="$pentium_configs"
-#strip=yes
-
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_flags="$pentium_cflags $fast_cflags $max_cflags -g"
+extra_configs="$pentium_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-valgrind-max

@@ -3,13 +3,13 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
 # We want to test isam when building with valgrind
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_leave_isam_configs --with-isam"
 
 . "$path/FINISH.sh"
 

BUILD/compile-ppc-debug-max

@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $debug_cflags"
+extra_flags="$ppc_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$debug_configs"
-
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-ppc-max

@@ -3,11 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $fast_cflags -g"
-#strip=yes
-
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_flags="$ppc_cflags $fast_cflags $max_cflags -g"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"