diff options
| author | Monty <monty@mariadb.org> | 2019-02-06 20:43:28 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-02-06 22:18:20 +0200 |
| commit | 4eae9eeccc4dc5301a5a1b53d1de0b33271fe1ce (patch) | |
| tree | c9ca0c0c3777f1659adfeb987c1f1ebda8651c75 /BUILD | |
| parent | d0799a04791588ba7f89f59516475c25947034e2 (diff) | |
| download | mariadb-git-4eae9eeccc4dc5301a5a1b53d1de0b33271fe1ce.tar.gz | |
Backport BUILD scripts from 10.4
- Fixes building with galera and tokudb
- Added support for --without-wsrep BUILD script option
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index e9bede9c746..7e6f0831423 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -122,7 +122,8 @@ get_make_parallel_flag # SSL library to use.--with-ssl will select our bundled yaSSL # implementation of SSL. --with-ssl=yes will first try system library # then the boundled one --with-ssl=system will use the system library. -SSL_LIBRARY=--with-ssl=system +# We use bundled by default as this is guaranteed to work with Galera +SSL_LIBRARY=--with-ssl if [ "x$warning_mode" = "xpedantic" ]; then warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE" @@ -194,6 +195,8 @@ base_configs="$base_configs --with-extra-charsets=complex " base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --with-big-tables $maintainer_mode" base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables" +# Following is to get tokudb to work +base_configs="$base_configs --with-jemalloc=NO" if test -d "$path/../cmd-line-utils/readline" then |