Automatic merge

This commit is contained in:
Michael Widenius 2012-02-21 01:49:14 +02:00
commit d7283f54fe

View File

@ -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;