summaryrefslogtreecommitdiff
path: root/sql/signal_handler.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-21 01:49:14 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-21 01:49:14 +0200
commitd7283f54fec459ab7579ccc017573f62432a2e3e (patch)
treea1d7e1a49b4847905c858432e4f6dafa88647f68 /sql/signal_handler.cc
parentdf8befc08c306f0f30123b5515fdda60a2a721a8 (diff)
parentf4885c092e3414cb4274e055310f27eae1d28819 (diff)
downloadmariadb-git-d7283f54fec459ab7579ccc017573f62432a2e3e.tar.gz
Automatic merge
Diffstat (limited to 'sql/signal_handler.cc')
-rw-r--r--sql/signal_handler.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
index 6406cd3bae0..62f8190010f 100644
--- a/sql/signal_handler.cc
+++ b/sql/signal_handler.cc
@@ -177,6 +177,12 @@ extern "C" sig_handler handle_fatal_signal(int sig)
case THD::KILL_QUERY:
kreason= "KILL_QUERY";
break;
+ case THD::KILL_SYSTEM_THREAD:
+ kreason= "KILL_SYSTEM_THREAD";
+ break;
+ case THD::KILL_SERVER:
+ kreason= "KILL_SERVER";
+ break;
case THD::KILLED_NO_VALUE:
kreason= "KILLED_NO_VALUE";
break;