Commit 98b9ac69 authored by unknown's avatar unknown
Browse files

After merge fix

parent 5305cd7c

sql/mysqld.cc

+4 −0
Original line number Diff line number Diff line
@@ -3141,7 +3141,11 @@ int main(int argc, char **argv) 
  MY_INIT(argv[0]);		// init my_sys library & pthreads



  /* 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())