From: Tor Didriksen
Date: December 2 2010 11:25am
Subject: bzr commit into mysql-5.1-bugteam branch (tor.didriksen:3512) Bug#58426
List-Archive: http://lists.mysql.com/commits/125801
X-Bug: 58426
Message-Id: <20101202112510.3A2F91646@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8718658460837027178=="

--===============8718658460837027178==
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:mats.kindahl@stripped

 3512 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 */


--===============8718658460837027178==
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\
#   k5em857jxcuy0zul
# target_branch: file:///export/home/didrik/repo/5.1-bugteam/
# testament_sha1: b4f47c35dc900ffe8e5ef1fa627e914108867ea9
# timestamp: 2010-12-02 12:25:09 +0100
# source_branch: file:///export/home/didrik/repo/5.1-bugteam-regex/
# base_revision_id: mats.kindahl@stripped\
#   7udci9op4lc6jvtb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdH7msIAAePfgEAQWGf//16s
jgS////6UATvcgEmhrQADDSaKeppkA00G0jINAAZDQAAc0xMBGmBGEYAAAAmEYDU000nqFPyT1Gg
NQek9IyBoBoNMgBzTEwEaYEYRgAAACYRgJJAmgCaBoAptCPRT00CPSaMhmoYpXGkCbgJnrcivsBI
/NJ7d1XLSA3TZWDpALTUWowwzdatpFEYYDLGNkDV897DMavqvxCjRDnDMxm50PY9Ko1PyEJIX7fn
izB6vWhzd+6h2ha7bdeqngv+GaQuhtenI+qLhOH04nBqTY10K/eVeMtxRsoc2yFyawatDCuEMpXt
tQepQxd3v8kbK8n9HytaoqWtItoCxdc/GqXVZCqe7pwO/dCILMg5B7GoWMcr63wSxG9ydXxtTCHg
DLb7nrSlFks7yS73yUQipNKwVYnG1l4P33zEu9gsMTZ4ZopdYRzVxWAH9lekhg664m+BpSmrl8j3
XGFJx0XY8LePHwWlYXNrcvWBwkkOVi/FRxUqiHTbObrp5xooHUuUzDW8MKauy+vZhFbKYsqXF7y+
ye29cJtQlWlg4VlLq8Rzn0POuKpyOxTuOJPYn8s6llyCrDAXxsDTF2pMEeYr6zRsk8f66Etj4JUZ
OIYWq1WwzL1otVw3Sm0tjI3OjkNlcwtZIM42LlJGWK+9qDEfLDMcag2e+9URGUYrwzRcLp2LAOCm
w54VTmfLJ4zsw05qXnAywECdXWTZrQcPJOUHSoc8fMJuahdUXX+w0HV9jZjBt3f9NUQK01c0zN9T
3932L0zfzGiB/gQ/B9w+8xvmFAVWYy+ghKsAbGJ5wOiSUZ3SYi1KDAYN7ixEDAw4w3i0ySgFokWz
sIhatDlgeLUNhDbuPza+5GuD8aGXcR/SofUycDb7fDOj5NndD9LKG+tc5QR8r+xGWMT3tFX0xvNu
GjmVbrLFtcwJ6+IKz6CmpYyZzeePLXaSKFZooU4YHTOTUEc8G1pqz56Rc/4aG41oHnMe5WJGvLZf
3H7626bo8XJMTSAY0sjvSRmuxNNtGrSdwwtQQCgSQU1RmNLc+yRSnnytu7G4/dxOekThFN56plzW
3Egp5aX0wOPFazaqNz4pkSSozoUsKzdCm9sb7J8IqhPpcSEwLjgCjFUwtBke8iMj39BS87VHr4+V
fXmy1Pc97A8ug5ZLpF/jeuC1BAz6rFxg0N/sqyD+OiB7E2LlSIebrmC/7BA3eVWqKVHPRF1U6+HK
qd95cxROnvDLLtum165LzW8W8dAX+27RcVwrXYI3qwYcOLWvDGQQeDPTFHHHsWypYgmVdXN7rXbW
UcwQtmuBdsZIqFJz1YpwcVGUoQPO7v+1NFNbvy3qx9Eyggb9lRbNMwMMiHxcHXk6+ilP1Dk5kyz6
O3tg95Agmop7eHobUKuTVjMvhvKsT9071ncg9QTBmSucqXcJVQY5doOUObMHtd7SRGqHdWbC2BV5
+XLWVjnBoHoHJgCC9P7l9aaHooT+tZHHmIwnMGcYxdJRDnr4GRMdTQPCA6jTFk7Z2aBGaJY4ungr
Qf4q4zN4eDU4I0fA+G9RCLW3A/Q2h7e01HtTJ3X0zVLbOkNTQHWOHublEuNkrU/SaRnGeAULFnV1
quCs8Fr+KwXBez+WFyXgLdpMC8KV4ivWKwYKPJbnFrHT3Z5CdIoDStwoF1no+5SwUrynvFf0YIv8
XckU4UJDR+5rCA==


--===============8718658460837027178==--