diff options
| author | ramil@mysql.com <> | 2005-12-14 21:42:08 +0400 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-12-14 21:42:08 +0400 |
| commit | 04cff0d055fd63d7f0a9395478171e735799f30b (patch) | |
| tree | 2f68502c48e42b5bee9fc749aee4efbe19233b62 /sql | |
| parent | 138ec21cc91994c223668aa3c19618e1975cfbce (diff) | |
| download | mariadb-git-04cff0d055fd63d7f0a9395478171e735799f30b.tar.gz | |
Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
Diffstat (limited to 'sql')
| -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 989b8142202..035018c91bc 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); |