summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-11-02 14:57:19 +0200
committerunknown <monty@mysql.com>2005-11-02 14:57:19 +0200
commit8c38a382a4d3f4c0fd6ce8ac69545ceec5b30fea (patch)
treef14785e1b060620150ac3ba35f56c2d98b7f0935
parent94298b10ab4670aa05139da5b11a7b85d076ca0f (diff)
parenta9b66318889339132295ba313c50dd8023d44199 (diff)
downloadmariadb-git-8c38a382a4d3f4c0fd6ce8ac69545ceec5b30fea.tar.gz
Merge monty@192.168.0.9:/my/mysql-5.0
into mysql.com:/my/mysql-5.0
-rwxr-xr-xBUILD/SETUP.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index d598ab94fd0..3a330853855 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -52,8 +52,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
#debug_extra_warnings="-Wuninitialized"
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-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-yassl"
-base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"
+base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-yassl"
+base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-yassl"
max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-yassl --with-embedded-server --with-big-tables"
max_configs="$base_max_configs --with-embedded-server"
max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"