bzr commit into mysql-6.0 branch (azundris:2776) Bug#37869

[Tatiana A. Nurnberg]

#At file:///misc/mysql/forest/37869/60-37869/

 2776 Tatiana A. Nurnberg	2008-08-19
      Bug#37869: mysqld stopped reacting to SIGINT when run with --gdb
      
      Control-C was misdirected to a handler that ignored it.
modified:
  sql/mysqld.cc

per-file messages:
  sql/mysqld.cc
    SIGINT was always redirected to end_thread_signal in 6.0,
    but e/t/s did not bother to handle it (since current_thread
    is NULL in that case).
    (also: statement order changed to coincide with 5.0 & 5.1)
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-07-19 03:03:39 +0000
+++ b/sql/mysqld.cc	2008-08-19 02:55:11 +0000
@@ -2739,11 +2739,9 @@ static void init_signals(void)
     sigaddset(&set,THR_SERVER_ALARM);
   if (test_flags & TEST_SIGINT)
   {
+    my_sigset(thr_kill_signal, end_thread_signal);
     // May be SIGINT
     sigdelset(&set, thr_kill_signal);
-    sigdelset(&set, SIGINT);
-    my_sigset(thr_kill_signal, end_thread_signal);
-    my_sigset(SIGINT, end_thread_signal);
   }
   else
     sigaddset(&set,SIGINT);