Merge lp:~laurynas-biveinis/percona-server/bug805805-1060136-1061118-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge fixes for bug 1060136, bug 1061118, bug 805805 from 5.1.

The bug 1061118 bits are null-merged, the rest auto-merged.

http://jenkins.percona.com/job/percona-server-5.5-param/533/

[Alexey Kopytov (akopytov)]

OK to push after addressing the comments in 5.1 and re-merging to 5.5.

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Setting to WiP to avoid accidental merge :)

Unmerged revisions

312. By Laurynas Biveinis on 2012-10-04

Merge fixes for bug 1060136, bug 1061118, bug 805805 from 5.1.

The bug 1061118 bits are null-merged, the rest auto-merged.

=== modified file 'Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc'
--- Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc	2011-06-30 15:46:53 +0000
+++ Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc	2012-10-04 16:16:55 +0000
@@ -152,11 +152,14 @@
   pid_t own_pid= getpid();
   pid_t parent_pid= getppid();
   bool nocore = false;
+  struct sigaction sigchld_action;
 
+  sigchld_action.sa_handler= handle_signal;
+  sigchld_action.sa_flags= SA_NOCLDSTOP;
   /* Install signal handlers */
   signal(SIGTERM, handle_signal);
   signal(SIGINT,  handle_signal);
-  signal(SIGCHLD, handle_signal);
+  sigaction(SIGCHLD, &sigchld_action, NULL);
   signal(SIGABRT, handle_abort);
 
   sprintf(safe_process_name, "safe_process[%ld]", (long) own_pid);

=== added file 'Percona-Server/mysql-test/r/percona_signal_handling.result'
--- Percona-Server/mysql-test/r/percona_signal_handling.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_signal_handling.result	2012-10-04 16:16:55 +0000
@@ -0,0 +1,3 @@
+SELECT 2+2;
+2+2
+4

=== added file 'Percona-Server/mysql-test/t/percona_signal_handling.test'
--- Percona-Server/mysql-test/t/percona_signal_handling.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_signal_handling.test	2012-10-04 16:16:55 +0000
@@ -0,0 +1,8 @@
+--source include/not_windows.inc
+
+let $mysqld_pid_file=`SELECT @@GLOBAL.pid_file`;
+
+system kill -STOP `cat $mysqld_pid_file`;
+system kill -CONT `cat $mysqld_pid_file`;
+
+SELECT 2+2;

=== modified file 'Percona-Server/sql/net_serv.cc'
--- Percona-Server/sql/net_serv.cc	2012-05-10 07:49:14 +0000
+++ Percona-Server/sql/net_serv.cc	2012-10-04 16:16:55 +0000
@@ -632,11 +632,12 @@
     if ((long) (length= vio_write(net->vio,pos,(size_t) (end-pos))) <= 0)
     {
       my_bool interrupted = vio_should_retry(net->vio);
-#if !defined(NO_ALARM) && !defined(__WIN__)
+#if !defined(__WIN__)
       if ((interrupted || length == 0) && !thr_alarm_in_use(&alarmed))
       {
         if (!thr_alarm(&alarmed, net->write_timeout, &alarm_buff))
         {                                       /* Always true for client */
+#if !defined(NO_ALARM)
 	  my_bool old_mode;
 	  while (vio_blocking(net->vio, TRUE, &old_mode) < 0)
 	  {
@@ -654,6 +655,7 @@
 #endif
 	    goto end;
 	  }
+#endif /* !defined(NO_ALARM) */
 	  retry_count=0;
 	  continue;
 	}
@@ -835,7 +837,7 @@
 
 	  DBUG_PRINT("info",("vio_read returned %ld  errno: %d",
 			     (long) length, vio_errno(net->vio)));
-#if !defined(NO_ALARM) && (!defined(__WIN__) || defined(MYSQL_SERVER))
+#if !defined(__WIN__) || defined(MYSQL_SERVER)
 	  /*
 	    We got an error that there was no data on the socket. We now set up
 	    an alarm to not 'read forever', change the socket to non blocking
@@ -845,6 +847,7 @@
 	  {
 	    if (!thr_alarm(&alarmed,net->read_timeout,&alarm_buff)) /* Don't wait too long */
 	    {
+#if !defined(NO_ALARM)
 	      my_bool old_mode;
 	      while (vio_blocking(net->vio, TRUE, &old_mode) < 0)
 	      {
@@ -867,6 +870,7 @@
 #endif
 		goto end;
 	      }
+#endif /* !defined(NO_ALARM) */
 	      retry_count=0;
 	      continue;
 	    }