summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-12-12 01:00:45 +0100
committerSergei Golubchik <serg@mariadb.org>2017-01-15 07:41:13 +0100
commitab3388c3c44caecbec9974f54a2f30dd06237eee (patch)
treed71a28727cae662c98c065a9f95f21836d0710df /libmysqld
parent1282eb694c9fb18cac6bace643b4ce275a6a5689 (diff)
downloadmariadb-git-ab3388c3c44caecbec9974f54a2f30dd06237eee.tar.gz
bugfix: mutex order violation in embedded
safe_mutex: Found wrong usage of mutex 'LOCK_thread_count' and 'LOCK_status' Mutex currently locked (in reverse order): LOCK_status sql/sql_class.h line 3873 LOCK_thread_count libmysqld/lib_sql.cc line 432
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 63424af27f6..0dfb1a1ad9a 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -434,8 +434,8 @@ static void emb_free_embedded_thd(MYSQL *mysql)
thread_count--;
thd->store_globals();
thd->unlink();
- delete thd;
mysql_mutex_unlock(&LOCK_thread_count);
+ delete thd;
my_pthread_setspecific_ptr(THR_THD, 0);
mysql->thd=0;
}