diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
| commit | ddc46740a56bf3885ae33dc21e281c063d189abf (patch) | |
| tree | 95de2e32ed970c1370e9c3fa15290b88d13955da /libmysqld | |
| parent | d61cffa6b1dd8b25dbae2536af1b0b59091b9f06 (diff) | |
| parent | c7db46a2427e933a379d0a8c62221c344a29ea06 (diff) | |
| download | mariadb-git-ddc46740a56bf3885ae33dc21e281c063d189abf.tar.gz | |
Merge 5.5->10.0-base
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index e025af0ac8f..0809e91d134 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -684,8 +684,10 @@ void *create_embedded_thd(int client_flag) thd->data_tail= &thd->first_data; bzero((char*) &thd->net, sizeof(thd->net)); + mysql_mutex_lock(&LOCK_thread_count); thread_count++; threads.append(thd); + mysql_mutex_unlock(&LOCK_thread_count); thd->mysys_var= 0; return thd; err: |