diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-07 17:50:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-07 17:52:27 +0200 |
| commit | 913e33e423b434712a9d708cd0f0244d2f03cb0b (patch) | |
| tree | 6f276c6426bd91a8b7f35614a20ddfa2df89b213 /dbug | |
| parent | 2faefe5f7f432f8d9b3435dd8f4e2a37163c5527 (diff) | |
| parent | e3adf96aeb39ad43143ca2a9c7a2f23d06e8e26b (diff) | |
| download | mariadb-git-913e33e423b434712a9d708cd0f0244d2f03cb0b.tar.gz | |
Merge 10.1 into 10.2
Rewrite the MDEV-13818 fix to prevent heap-use-after-free.
Add a test case for MDEV-18272.
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/tests.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/dbug/tests.c b/dbug/tests.c index 22a445fdeca..70424046bf4 100644 --- a/dbug/tests.c +++ b/dbug/tests.c @@ -86,3 +86,11 @@ int main (int argc __attribute__((unused)), return 0; #endif /* DBUG_OFF */ } + +#ifdef __SANITIZE_ADDRESS__ +/* Disable LeakSanitizer in this executable */ +const char* __asan_default_options() +{ + return "detect_leaks=0"; +} +#endif |