summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2007-03-29 19:31:42 +0300
committerunknown <jani@ua141d10.elisa.omakaista.fi>2007-03-29 19:31:42 +0300
commit0fdd64ba6391e556c3438733cb4f479f2c3395cf (patch)
tree7d2400345350908d7d88b9a8df4cff268cc257db /sql
parent70e4ba1f7c5ed0032557ce32fefa332ec5da709b (diff)
downloadmariadb-git-0fdd64ba6391e556c3438733cb4f479f2c3395cf.tar.gz
Merged from 5.0
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index cf9a139c0f9..b7858b3178d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2351,7 +2351,8 @@ static void init_signals(void)
#ifdef SIGTSTP
sigaddset(&set,SIGTSTP);
#endif
- sigaddset(&set,THR_SERVER_ALARM);
+ if (thd_lib_detected != THD_LIB_LT)
+ sigaddset(&set,THR_SERVER_ALARM);
if (test_flags & TEST_SIGINT)
{
// May be SIGINT