Commit ae1e1ca2 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  bodhi.(none):/opt/local/work/mysql-5.1-27430
parents 62c6ffd8 cae01871

sql/mysqld.cc

+2 −0
Original line number Diff line number Diff line
@@ -1956,9 +1956,11 @@ static BOOL WINAPI console_event_handler( DWORD type ) 
       between main thread doing initialization and CTRL-C thread doing

       cleanup, which can result into crash.

     */

#ifndef EMBEDDED_LIBRARY

     if(hEventShutdown)

       kill_mysql();

     else

#endif

       sql_print_warning("CTRL-C ignored during startup");

     DBUG_RETURN(TRUE);

  }