diff options
| -rw-r--r-- | sql/examples/ha_tina.cc | 12 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index f328a631d10..383feb60050 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -276,6 +276,18 @@ bool tina_end() return FALSE; } +bool tina_end() +{ + if (tina_init) + { + hash_free(&tina_open_tables); + VOID(pthread_mutex_destroy(&tina_mutex)); + } + tina_init= 0; + return FALSE; +} + + /* Finds the end of a line. Currently only supports files written on a UNIX OS. diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5dcfc45be6f..d14e7308718 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3349,7 +3349,11 @@ int main(int argc, char **argv) DEBUGGER_OFF; /* Set signal used to kill MySQL */ +#if defined(SIGUSR2) thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2; +#else + thr_kill_signal= SIGINT; +#endif #ifdef _CUSTOMSTARTUPCONFIG_ if (_cust_check_startup()) |