From: Tor Didriksen
Date: November 26 2010 2:04pm
Subject: bzr commit into mysql-5.1-bugteam branch (tor.didriksen:3521) Bug#58426
List-Archive: http://lists.mysql.com/commits/125156
X-Bug: 58426
Message-Id: <20101126140420.1B34237A0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3292486940331199013=="

--===============3292486940331199013==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/5.1-bugteam/ based on revid:azundris@stripped

 3521 Tor Didriksen	2010-11-26
      Bug #58426 Crashing tests not failing as they are supposed to on Solaris 10 debug
        
      On this platform we either
       - get lots of other signals
       - or maybe we lose the KILL signal
        
      Solution: loop with { kill; pause; } until process dies.
     @ include/my_dbug.h
        Let DBUG_SUICE loop forever until the KILL signal is delivered, and process dies.

    modified:
      include/my_dbug.h
=== modified file 'include/my_dbug.h'
--- a/include/my_dbug.h	2010-10-18 11:24:34 +0000
+++ b/include/my_dbug.h	2010-11-26 14:04:06 +0000
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #endif
 #include <signal.h>
+#include <stdio.h>
 #endif  /* not __WIN__ */
 
 #if defined(__cplusplus) && !defined(DBUG_OFF)
@@ -160,7 +161,18 @@ extern  void _db_flush_();
 #ifdef __WIN__
 #define DBUG_SUICIDE() DBUG_ABORT()
 #else
-#define DBUG_SUICIDE() (_db_flush_(), kill(getpid(), SIGKILL), pause())
+static inline void do_kill_and_pause_forever()
+{
+  fprintf(stderr, "SIGKILL myself\n");
+  fflush(stderr);
+  do
+  {
+    kill(getpid(), SIGKILL);
+    pause();
+  }
+  while(1);
+}
+#define DBUG_SUICIDE() (_db_flush_(), do_kill_and_pause_forever())
 #endif
 
 #else						/* No debugger */


--===============3292486940331199013==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   xp02ggxf4bohfp55
# target_branch: file:///export/home/didrik/repo/5.1-bugteam/
# testament_sha1: aed81c73437a377d8f16712580d4e1b2f606eae7
# timestamp: 2010-11-26 15:04:19 +0100
# source_branch: file:///export/home/didrik/repo/5.1-bugteam-regex/
# base_revision_id: azundris@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR7Vww8AAd3fgEAQWGf//16s
jgS////6UATNsvXbNXu3q8nV72TrcMiJppqU/CU/KbRhNGjVNpHiT1B5QZGjQMkJiaGU9BJmpp6a
jSZ6poYIwg0NNMJIQSnhBlPU9U9BNlAZAGQaADQNNUZTE0eoAAABoAGgyNAAkkQ0aaKY1T1N5NNJ
P1T1NqNP1QyHqAyAaLySayRB2pHbud06+t5T/SM8vNtmlBhQmcVECK+iJqlFojvsFMYYDdtndI0+
HQwzGfcvzKuUuEuDGPLWGOe2dsbEE6E9raYm7za+DFfv0gznffnn16VV29+Mxws/LaN7ZRYKQ3No
aFijrfve79JVWnmk1sGrbfui5hj1BTcJbEo/M4dSk1eXPkRZm1M3sdKkBA6QRL4F8pWrCDvAyb7A
dY1WsjgUJmAN4HKlrHtgthMwmhbDKsoQGkFSDbmCo3g3UcalMLw2wOxTA5Sk6FVomMdH5QQrGCR1
HRpsnQOplC5wkCLRCq8O1XYXGHe5owBqLNchN9KcmuO75N5Oo5rVhTLdOSbRp1EZfi4laNyV1Mr9
oziZjkUOHEbNzwgLqtver6K2gK55reSfjYnBdOKImLWkSlRXzB7mGJoxLBpcJDlMAbxGvIJTM7A1
Bkl8ixxXgcQZy7bAFIC2G8xrGGpFBPaIM100AuTcrasOsEkNgr30DWtR4nWBe905Wzu0hcxo1h/l
XwNy4xjNRxq2t+Aq6VLLaIsK8Rioc0y6sME1nMqjpUqLxoddVVta8GKmZaQ07Zs9b3IKOpPVnK2B
Y7VOtGGveZGuL22GxrOWGmsAaEfdQk9RsvRichMS3FDyArwJAJHQeIDgEZbKOYz5uRE9G2swPjzN
Llva/mODebq6DPMeHI007uwCRcWkBky1Ha02wlu5T+/GL0aSima8pPvVYtcFuvM3EiubpTZ6lZ3X
vBhB5HbPiRp5/Fwv9iSS0JKNG0a+jDNmAddqRlRTumzt7bcd8eMoTiqzqn2kyig4FZScZzs7IzYK
QAwbAxTAgQKU9arIsh1qTfpitWKNCAieHijlWrbp02fAXKoEBSBLFosz3PlDLJUOE0hftrdwSHoq
x6ECwf8oczjIMLdly3sGWRwGJd27RElZro3rtOkYA+Pu12XT4DOG+keCMtdlsDVFCh1IKsLLw4IR
y2ncDHz+4NBjyuBbyl4YodDFYxAGChqm8G45Ob7+46gPMM3NfHjTuD59YD2KWJKpA8ysYMfuExv9
kds4I8aYlg/Nr2wfPOJkEb5FPACuvvmek52G4eO0+k1gN0DxQYoYlaGycHvVTlDLX01LoAZU8HOk
69ls1BNJ1LQm1iECy0kpuYHhVlKUIGQRvOPT2vh/GghhQosAHrVmriTMDFU5Ng6G1UsIoOnZMtuO
/fKIJEk1fgLPH6GAKuhqxmXvxI6xvGFgHiAwakrHKl2MVCM7FwsswiKjgzBm7iUFNk3ntMCMxH3d
mXSVjnByEAOmBSXN96dlHRRcXmuJ49KDZY6sB4MZvRTDTnNCo9lB1EiKcYN7sUGuRwcwu1q8I6lg
bG6uCSTkU8RxtMQEWJWacBtSYqWLtFZCd/TPIbI3gaEaPa5Dt0zMDdTBRmZjPlIKraz3Wwr+5aa1
zrf9GFwWElyVw42hUrFqVrBRexWx5uvU04GYoBcpiT7UCMSJFsDu5G0ZhIJ/i7kinChID2rhh4A=


--===============3292486940331199013==--