diff options
| author | hf@deer.mysql.r18.ru <> | 2003-04-08 19:43:24 +0500 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-04-08 19:43:24 +0500 |
| commit | 5d4e9f95f2bdaff5d57b217fbb788fcea0144734 (patch) | |
| tree | 01d8c458001514d5c89684a3b748ad31483c8557 /sql/mysqld.cc | |
| parent | 462430ba558f047c8792ff577b45077aa332856a (diff) | |
| parent | 0428d08606269faf5eddd5740b5f9e80abfacbe4 (diff) | |
| download | mariadb-git-5d4e9f95f2bdaff5d57b217fbb788fcea0144734.tar.gz | |
Merging
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d33ea108b34..f4d9b65551c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -634,7 +634,7 @@ static void close_connections(void) { DBUG_PRINT("quit",("Informing thread %ld that it's time to die", tmp->thread_id)); - tmp->killed=1; + tmp->killed= THD::KILL_CONNECTION; if (tmp->mysys_var) { tmp->mysys_var->abort=1; @@ -1394,7 +1394,7 @@ extern "C" sig_handler abort_thread(int sig __attribute__((unused))) THD *thd=current_thd; DBUG_ENTER("abort_thread"); if (thd) - thd->killed=1; + thd->killed= THD::KILL_CONNECTION; DBUG_VOID_RETURN; } #endif @@ -2852,7 +2852,7 @@ static void create_new_thread(THD *thd) ("Can't create thread to handle request (error %d)", error)); thread_count--; - thd->killed=1; // Safety + thd->killed= THD::KILL_CONNECTION; // Safety (void) pthread_mutex_unlock(&LOCK_thread_count); net_printf(thd,ER_CANT_CREATE_THREAD,error); (void) pthread_mutex_lock(&LOCK_thread_count); |