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

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

sql/sql_parse.cc

+4 −2
Original line number Diff line number Diff line
@@ -706,8 +706,10 @@ pthread_handler_decl(handle_bootstrap,arg) 
  thd->dbug_thread_id=my_thread_id();

#if !defined(__WIN__) && !defined(OS2)

  sigset_t set;

  VOID(sigemptyset(&set));			// Get mask in use

  VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));

  VOID(sigemptyset(&set));

  VOID(sigaddset(&set,SIGINT));		

  // Get mask in use and block SIGINT 

  VOID(pthread_sigmask(SIG_BLOCK,&set,&thd->block_signals));

#endif



  if ((ulong) thd->variables.max_join_size == (ulong) HA_POS_ERROR)