Commit 34414314 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
parents 9e01ae9f d3c1511a

sql/mysqld.cc

+4 −0
Original line number Diff line number Diff line
@@ -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