From aa032356e26466f271e8647056a5ee53e27865e4 Mon Sep 17 00:00:00 2001
From: "brian@zim.(none)" <>
Date: Fri, 15 Jul 2005 11:15:44 -0700
Subject: Removed dead options, fixed pentium script to no longer ask for isam
 (its not included in 5.0).

---
 BUILD/SETUP.sh                              | 7 +++----
 BUILD/compile-pentium-debug-max-no-embedded | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index a507d30e518..32dd915e60e 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -48,10 +48,9 @@ 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-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-big-tables"
-max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server --with-big-tables"
-max_no_es_configs="$max_leave_isam_configs --without-isam"
-max_configs="$max_no_es_configs --with-embedded-server"
+base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine"
+max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables"
+max_configs="$base_max_configs --with-embedded-server"
 
 path=`dirname $0`
 . "$path/check-cpu"
diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded
index 803a6a9d6d3..dfdf7d0a5e1 100755
--- a/BUILD/compile-pentium-debug-max-no-embedded
+++ b/BUILD/compile-pentium-debug-max-no-embedded
@@ -6,6 +6,6 @@ path=`dirname $0`
 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 $max_no_es_configs"
+extra_configs="$pentium_configs $debug_configs $base_max_configs"
 
 . "$path/FINISH.sh"
-- 
cgit v1.2.1