diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
| commit | 58a75bb18b2a4080c8fae77024afed37f1be1314 (patch) | |
| tree | 4d9d65f5747636d6dea9295e79464108df24a9a2 /BUILD/SETUP.sh | |
| parent | 99b79db5dca6909456a40d859298ba3992b145da (diff) | |
| parent | a82671178919afba86ddfdf2b64321eb9afff8e5 (diff) | |
| download | mariadb-git-58a75bb18b2a4080c8fae77024afed37f1be1314.tar.gz | |
Automerge with 5.1
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 0ad5351f545..33830fd9987 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -91,8 +91,8 @@ path=`dirname $0` get_make_parallel_flag # SSL library to use.--with-ssl will select our bundled yaSSL -# implementation of SSL. To use openSSl you will nee too point out -# the location of openSSL headers and lbs on your system. +# implementation of SSL. To use OpenSSL you will need to specify +# the location of OpenSSL headers and libs on your system. # Ex --with-ssl=/usr SSL_LIBRARY=--with-ssl @@ -182,8 +182,7 @@ max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max" max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache" max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent" max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent" -# Disable NDB in maria max builds -max_configs=$max_no_ndb_configs +all_configs="$SSL_LIBRARY --with-plugins=max --with-plugin-ndbcluster --with-embedded-server --with-libevent" # # CPU and platform specific compilation flags. |