diff options
| author | monty@mysql.com <> | 2006-01-06 01:08:48 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-01-06 01:08:48 +0200 |
| commit | b0a5ea01ef4a9ba0f41c2c263b3cc53a0611fc1a (patch) | |
| tree | 14416e5a83f9880e39f89a0bf5f03a8613ef7ce0 /sql/mysqld.cc | |
| parent | b197c9abea9fdce0a595449f393520eb8354e784 (diff) | |
| parent | 6e22e29de669b95aefc4f5f7ce46420e52c99870 (diff) | |
| download | mariadb-git-b0a5ea01ef4a9ba0f41c2c263b3cc53a0611fc1a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8934b872c94..1f32a8285d1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1613,7 +1613,7 @@ void end_thread(THD *thd, bool put_in_cache) wake_thread--; thd=thread_cache.get(); thd->real_id=pthread_self(); - thd->thread_stack= (char *) &thd; + thd->thread_stack= (char*) &thd; // For store_globals (void) thd->store_globals(); thd->thr_create_time= time(NULL); threads.append(thd); |