Automatic merge

d7283f54 · Michael Widenius · df8befc0 · f4885c09 · d7283f54
Commit d7283f54 authored Feb 21, 2012 by Michael Widenius
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

sql/signal_handler.cc sql/signal_handler.cc +6 -0

No files found.
--- 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;