diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-26 12:13:41 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-26 12:13:41 +0400 |
| commit | b97e45f7b824de4e3aedbc16bfa32c5420659a0b (patch) | |
| tree | f892f915a8e0928507186a116a2b971d7c1ff27d /libmysqld | |
| parent | 2552a95621cb8c2527e626c2de788fed07254008 (diff) | |
| download | mariadb-git-b97e45f7b824de4e3aedbc16bfa32c5420659a0b.tar.gz | |
Fixed main.null failure in embedded
It is not permitted to "delete thd" under LOCK_thread_count anymore.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 1156d85bf83..36164c7a68b 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -428,8 +428,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; } |