diff options
| author | monty@narttu.mysql.fi <> | 2003-05-26 13:10:08 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-05-26 13:10:08 +0300 |
| commit | 48ecf0e8a7302ea4ab4e75307fc94da47bdc2017 (patch) | |
| tree | 00814a483a6d179c53200504ba6ad9e43a09712d /sql | |
| parent | 102c477760e26a927a01db3d47a7fd0c7d875eca (diff) | |
| download | mariadb-git-48ecf0e8a7302ea4ab4e75307fc94da47bdc2017.tar.gz | |
Fixed core dump bug when shuting down mysqld
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 67fb7798ebd..2992fcfd908 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -596,7 +596,7 @@ static void close_connections(void) unix_sock= INVALID_SOCKET; } #endif - end_thr_alarm(); // Don't allow alarms + end_thr_alarm(0); // Abort old alarms. end_slave(); /* First signal all threads that it's time to die */ @@ -905,6 +905,7 @@ void clean_up(bool print_message) #endif (void) ha_panic(HA_PANIC_CLOSE); /* close all tables and logs */ end_key_cache(); + end_thr_alarm(1); /* Free allocated memory */ #ifdef USE_RAID end_raid(); #endif @@ -2313,14 +2314,14 @@ The server will not act as a slave."); if (opt_bootstrap) { int error=bootstrap(stdin); - end_thr_alarm(); // Don't allow alarms + end_thr_alarm(1); // Don't allow alarms unireg_abort(error ? 1 : 0); } if (opt_init_file) { if (read_init_file(opt_init_file)) { - end_thr_alarm(); // Don't allow alarms + end_thr_alarm(1); // Don't allow alarms unireg_abort(1); } } |