diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-03 09:54:37 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-03 09:54:37 -0300 |
| commit | 745d2141baddb82896b9138f5c93abefff3df86c (patch) | |
| tree | c5472b84ff63f162dc502c6bd2d90d5d2fdec423 /BUILD | |
| parent | 5c6a9a5f6fb1c57ad99ac3a14a56ade38684d631 (diff) | |
| download | mariadb-git-745d2141baddb82896b9138f5c93abefff3df86c.tar.gz | |
Don't enable safemalloc for valgrind builds, it's too slow.
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 | ||||
| -rwxr-xr-x | BUILD/build_mccge.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 0bc16f120e5..626f932e045 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -122,7 +122,7 @@ fi # Override -DFORCE_INIT_OF_VARS from debug_cflags. It enables the macro # LINT_INIT(), which is only useful for silencing spurious warnings # of static analysis tools. We want LINT_INIT() to be a no-op in Valgrind. -valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify " +valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify " valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" valgrind_configs="--with-valgrind" # diff --git a/BUILD/build_mccge.sh b/BUILD/build_mccge.sh index 43ca117fb78..eb37323c570 100755 --- a/BUILD/build_mccge.sh +++ b/BUILD/build_mccge.sh @@ -938,7 +938,7 @@ set_up_ccache() set_valgrind_flags() { if test "x$valgrind_flag" = "xyes" ; then - loc_valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify " + loc_valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify " loc_valgrind_flags="$loc_valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" compiler_flags="$compiler_flags $loc_valgrind_flags" with_flags="$with_flags --with-valgrind" |