Commit ba52e741 authored by unknown's avatar unknown
Browse files

Removed dead options, fixed pentium script to no longer ask for isam (its not included in 5.0). 


BUILD/SETUP.sh:
  Removed dead options, added blackhole option
BUILD/compile-pentium-debug-max-no-embedded:
  Updated option to remove unused option
parent 51308e23

BUILD/SETUP.sh

+3 −4
Original line number Diff line number Diff line
@@ -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"

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

+1 −1
Original line number Diff line number Diff line
@@ -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"