diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-09-10 18:01:27 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-09-10 18:01:27 +0300 |
| commit | 3fb22ac5e146e1fe34d282c3c3ef6bd50af90ca5 (patch) | |
| tree | 4f069ae5398a3e17417f942cb6926c66efe968a6 /sql/sql_class.h | |
| parent | 3769841d9e706ee018d5273d2901954b9a281c3e (diff) | |
| parent | 0db9c26b05439f9d6fc29234966f50d8e393dfe2 (diff) | |
| download | mariadb-git-3fb22ac5e146e1fe34d282c3c3ef6bd50af90ca5.tar.gz | |
Merge with 5.2
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 3403126a3aa..748c2a4a818 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1978,7 +1978,9 @@ public: NOT_KILLED=0, KILL_BAD_DATA=1, KILL_CONNECTION=ER_SERVER_SHUTDOWN, + KILL_SYSTEM_THREAD=ER_NEW_ABORTING_CONNECTION, /* Kill connection nicely */ KILL_QUERY=ER_QUERY_INTERRUPTED, + KILL_SERVER, /* Placeholder for shortdown */ KILLED_NO_VALUE /* means neither of the states */ }; killed_state volatile killed; |