diff options
| author | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
| commit | 84514ec643aafe74b7ac256fa485013e222f942e (patch) | |
| tree | 6f77ba0109d6764bd1fcae51dde8eec75e7ebc67 /BUILD | |
| parent | 071f52839937bada46c53af23eb220e993c1e12d (diff) | |
| parent | 95f393394442437eea403d91c3c4bd68ec24fdf9 (diff) | |
| download | mariadb-git-84514ec643aafe74b7ac256fa485013e222f942e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
sql/table.cc
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium64-asan-max | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 3a1a861f2f8..721ed3a4c45 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -308,3 +308,5 @@ gprof_compile_flags="-O2 -pg -g" gprof_link_flags="--disable-shared $static_link" disable_gprof_plugins="--with-zlib-dir=bundled --without-plugin-oqgraph --without-plugin-mroonga" + +disable_asan_plugins="--without-plugin-rocksdb" diff --git a/BUILD/compile-pentium64-asan-max b/BUILD/compile-pentium64-asan-max index cd5a292d17c..666a0d89d8c 100755 --- a/BUILD/compile-pentium64-asan-max +++ b/BUILD/compile-pentium64-asan-max @@ -18,7 +18,7 @@ path=`dirname $0` . "$path/SETUP.sh" extra_flags="$pentium64_cflags $debug_cflags -lasan -O -g -fsanitize=address" -extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs" +extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs $disable_asan_plugins" export LDFLAGS="-ldl" . "$path/FINISH.sh" |