diff options
| author | tnurnberg@mysql.com <> | 2006-05-31 14:27:31 +0200 |
|---|---|---|
| committer | tnurnberg@mysql.com <> | 2006-05-31 14:27:31 +0200 |
| commit | 4dc848752db35b605a7e9fa38529432b5baba225 (patch) | |
| tree | 528f1ab94885bb6f02b11310a2bb5e0fe643e8fe | |
| parent | 433c57d99718981fad089d453a19f7e84cc38847 (diff) | |
| download | mariadb-git-4dc848752db35b605a7e9fa38529432b5baba225.tar.gz | |
Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.
This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e44c353e6b2..ae5e85ca15f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -991,7 +991,11 @@ static void __cdecl kill_server(int sig_ptr) my_thread_init(); // If this is a new thread #endif close_connections(); - if (sig != MYSQL_KILL_SIGNAL && sig != 0) + if (sig != MYSQL_KILL_SIGNAL && +#ifdef __WIN__ + sig != SIGINT && /* Bug#18235 */ +#endif + sig != 0) unireg_abort(1); /* purecov: inspected */ else unireg_end(); |