summaryrefslogtreecommitdiff
path: root/mysys/thr_mutex.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-19 21:53:14 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-19 21:53:14 +0200
commit86a2d707794b075701f3ac5e565fc5c7e7fccfe2 (patch)
tree3538a24ed306fc91ed1b1d0b5af8e1ba8b8dfc90 /mysys/thr_mutex.c
parent957b559039ac6ab6d2af08dd271f789f6207a0b5 (diff)
downloadmariadb-git-86a2d707794b075701f3ac5e565fc5c7e7fccfe2.tar.gz
safe_mutex deadlock detector post-merge fixes
Diffstat (limited to 'mysys/thr_mutex.c')
-rw-r--r--mysys/thr_mutex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c
index 86a7ce9684b..83395adaf61 100644
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.c
@@ -201,7 +201,7 @@ int safe_mutex_init(safe_mutex_t *mp,
/* Deadlock detection is initialised only lazily, on first use. */
- mp->create_flags= safe_mutex_deadlock_detector ? MYF_NO_DEADLOCK_DETECTION : 0;
+ mp->create_flags= safe_mutex_deadlock_detector ? 0 : MYF_NO_DEADLOCK_DETECTION;
#ifdef SAFE_MUTEX_DETECT_DESTROY
/*