summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-29 11:05:26 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-29 11:05:26 +0200
commit0b73b96f9d3e6de66f2d2a4156b168187ed4d021 (patch)
tree001cb4a06732cfc4f06532f5ea0627dfcb7fbc74 /extra
parent33caaba5c81f47246052bf3ac6faca2c3a351b19 (diff)
parent68143c8905352361c30595864a90f494d9a3d99f (diff)
downloadmariadb-git-0b73b96f9d3e6de66f2d2a4156b168187ed4d021.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 9646e0eac03..f86395e494f 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -6515,3 +6515,12 @@ static int get_exepath(char *buf, size_t size, const char *argv0)
return my_realpath(buf, argv0, 0);
}
+
+
+#if defined (__SANITIZE_ADDRESS__) && defined (__linux__)
+/* Avoid LeakSanitizer's false positives. */
+const char* __asan_default_options()
+{
+ return "detect_leaks=0";
+}
+#endif