summaryrefslogtreecommitdiff
path: root/mysys/safemalloc.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-10-04 22:04:19 +0200
committerSergei Golubchik <sergii@pisem.net>2012-10-04 22:04:19 +0200
commit7077636ad4b24d3c854997883af763d2db95124d (patch)
treeb75d328eb76844f94e9070a8b8a414fcc72bc4c4 /mysys/safemalloc.c
parent172b631c7f0284a3245477d98463f7127c8692a0 (diff)
downloadmariadb-git-7077636ad4b24d3c854997883af763d2db95124d.tar.gz
compilation and test failures
Diffstat (limited to 'mysys/safemalloc.c')
-rw-r--r--mysys/safemalloc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 31f0333725f..2f01573fee7 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -96,8 +96,6 @@ void *sf_malloc(size_t size)
if (!init_done)
{
pthread_mutex_init(&sf_mutex, NULL);
- /* disable deadlock detector, because it calls my_malloc() */
- safe_mutex_setflags(&sf_mutex, MYF_NO_DEADLOCK_DETECTION);
atexit(sf_terminate);
init_done= 1;
}