diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-21 01:49:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-21 01:49:14 +0200 |
| commit | 37272d702565871199ab1e2e1ec6e3d64ba28641 (patch) | |
| tree | a1d7e1a49b4847905c858432e4f6dafa88647f68 /sql | |
| parent | 7501a7cc6a2fd78f520088b75edb7a23b02c1d9a (diff) | |
| parent | 128f2c89b3356403be26fba0eaca531a165da511 (diff) | |
| download | mariadb-git-37272d702565871199ab1e2e1ec6e3d64ba28641.tar.gz | |
Automatic merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/signal_handler.cc | 6 |
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; |