diff options
| author | unknown <pem@mysql.com> | 2004-03-02 16:01:02 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-03-02 16:01:02 +0100 |
| commit | 5aa57221d8b40a0b5146c9af027cdd2dc15af737 (patch) | |
| tree | 44ee211da6bb3cf7d540abe97ce21180a5ffc0b5 /sql/sp_head.cc | |
| parent | e55c4ed179c5703f7b0c4b5ea2a4f9c6c59d0b20 (diff) | |
| parent | 857b59578c61a15b842f30c1a9b1e0fad8c868a3 (diff) | |
| download | mariadb-git-5aa57221d8b40a0b5146c9af027cdd2dc15af737.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index d43ac54e57d..eebe02c1834 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -842,7 +842,10 @@ sp_instr_stmt::exec_stmt(THD *thd, LEX *lex) thd->lex->unit.thd= thd; // QQ Not reentrant freelist= thd->free_list; thd->free_list= NULL; + + VOID(pthread_mutex_lock(&LOCK_thread_count)); thd->query_id= query_id++; + VOID(pthread_mutex_unlock(&LOCK_thread_count)); // Copy WHERE clause pointers to avoid damaging by optimisation // Also clear ref_pointer_arrays. |