After merge fix

177a366e · istruewing@chilla.local · 3a664472 · 177a366e
Commit 177a366e authored Feb 02, 2007 by istruewing@chilla.local
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

sql/mysqld.cc sql/mysqld.cc +4 -0

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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())