Commit 8c9116a7 authored by peter@mysql.com's avatar peter@mysql.com

Do not crash on CTRL-C during then running mysqld --bootstrap

I'm not quite sure if this is correct way to fix it so please check
parent a1443a7e
...@@ -706,8 +706,10 @@ pthread_handler_decl(handle_bootstrap,arg) ...@@ -706,8 +706,10 @@ pthread_handler_decl(handle_bootstrap,arg)
thd->dbug_thread_id=my_thread_id(); thd->dbug_thread_id=my_thread_id();
#if !defined(__WIN__) && !defined(OS2) #if !defined(__WIN__) && !defined(OS2)
sigset_t set; sigset_t set;
VOID(sigemptyset(&set)); // Get mask in use VOID(sigemptyset(&set));
VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals)); VOID(sigaddset(&set,SIGINT));
// Get mask in use and block SIGINT
VOID(pthread_sigmask(SIG_BLOCK,&set,&thd->block_signals));
#endif #endif
if ((ulong) thd->variables.max_join_size == (ulong) HA_POS_ERROR) if ((ulong) thd->variables.max_join_size == (ulong) HA_POS_ERROR)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment