diff options
| author | unknown <ramil@mysql.com> | 2006-02-02 10:27:48 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-02-02 10:27:48 +0400 |
| commit | 20ae925c7de1ba9fb7474e1217489f4fb5b20507 (patch) | |
| tree | 9919e8964a87765e56f0e7badc6b6985603b9598 /sql/sql_class.cc | |
| parent | c98077d6101c7dc2b364e0536b1e675dc76d8f0f (diff) | |
| download | mariadb-git-20ae925c7de1ba9fb7474e1217489f4fb5b20507.tar.gz | |
Fix for bug #16900: Crash during query "reap" on OS X.
sql/sql_class.cc:
Fix for bug #16900: Crash during query "reap" on OS X.
- call close_active_vio() only if we don't kill the thread.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 6e24e951aa4..d8edd2d29b2 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -426,11 +426,12 @@ void THD::awake(bool prepare_to_die) THD_CHECK_SENTRY(this); safe_mutex_assert_owner(&LOCK_delete); + thr_alarm_kill(real_id); if (prepare_to_die) killed = 1; - thr_alarm_kill(real_id); #ifdef SIGNAL_WITH_VIO_CLOSE - close_active_vio(); + else + close_active_vio(); #endif if (mysys_var) { |