diff options
| author | unknown <kent@mysql.com> | 2005-12-18 15:26:37 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-18 15:26:37 +0100 |
| commit | 2de5c141627638ad375c1911f9a4a0b378599f4f (patch) | |
| tree | 12d22d19e36b93f1eaf7dd5261664eda0a781028 /sql/sql_class.cc | |
| parent | a3a5df43a53748e93c81df849f11c46abcb1ebd9 (diff) | |
| parent | 348efa52204e005abbf8d3c2610819c454fde9f5 (diff) | |
| download | mariadb-git-2de5c141627638ad375c1911f9a4a0b378599f4f.tar.gz | |
Merge
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/r/ndb_multi.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 5c3fe59e6fd..ed2089546da 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -473,10 +473,12 @@ void THD::awake(THD::killed_state state_to_set) killed= state_to_set; if (state_to_set != THD::KILL_QUERY) + { thr_alarm_kill(real_id); #ifdef SIGNAL_WITH_VIO_CLOSE - close_active_vio(); + close_active_vio(); #endif + } if (mysys_var) { pthread_mutex_lock(&mysys_var->mutex); |