Merge chilla.local:/home/mydev/mysql-5.0-axmrg

into chilla.local:/home/mydev/mysql-5.1-axmrg

Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
dde4f421 · istruewing@chilla.local · bdf18a85 · b4445664 · dde4f421
Commit dde4f421 authored Feb 03, 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
@@ -3479,7 +3479,11 @@ int main(int argc, char **argv)
  /* nothing should come before this line ^^^ */

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

  /*
    Perform basic logger initialization logger. Should be called after