summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-08 00:26:55 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-08 00:26:55 +0200
commit2d0dd62cf7e824f5bbc8d0367730adcdaf0eed68 (patch)
tree804b14fb55650c3af866d8bc19048594569e7f98 /dbug
parentd30f17af4969cc1ce34f1925f5ea2bced9c6f7e9 (diff)
parentbf71d263621c90cbddc7bde9bf071dae503f333f (diff)
downloadmariadb-git-2d0dd62cf7e824f5bbc8d0367730adcdaf0eed68.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'dbug')
-rw-r--r--dbug/tests.c8
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