diff options
| author | unknown <brian@zim.(none)> | 2005-07-15 11:15:44 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-07-15 11:15:44 -0700 |
| commit | ba52e741def7e49a9906b29755851987fb956bef (patch) | |
| tree | ece96a7a0735623ee212bcf9bbbcb5e540f98f9a /BUILD | |
| parent | 51308e23273537037a651c005659c4a8b8db96a4 (diff) | |
| download | mariadb-git-ba52e741def7e49a9906b29755851987fb956bef.tar.gz | |
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
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 7 | ||||
| -rwxr-xr-x | 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" |