diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 12:20:41 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 12:20:41 +0300 |
| commit | c063bd171e4eb4067e6684b77277e170b7a668bc (patch) | |
| tree | 8b36c387d70977c948b7d1412fcd7d9b940852af /sql/sql_class.h | |
| parent | b40aed07bffb6fa37fc03ccd063b5a189e8ddb71 (diff) | |
| parent | 754dee8e51950365956efb793af34a769cbd4792 (diff) | |
| download | mariadb-git-c063bd171e4eb4067e6684b77277e170b7a668bc.tar.gz | |
Manual merge from mysql-5.1.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 35b3531b0a4..f5d56192140 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -93,6 +93,8 @@ extern char internal_table_name[2]; extern char empty_c_string[1]; extern MYSQL_PLUGIN_IMPORT const char **errmesg; +extern bool volatile shutdown_in_progress; + #define TC_LOG_PAGE_SIZE 8192 #define TC_LOG_MIN_SIZE (3*TC_LOG_PAGE_SIZE) @@ -2140,7 +2142,11 @@ public: { int err= killed_errno(); if (err) + { + if ((err == KILL_CONNECTION) && !shutdown_in_progress) + err = KILL_QUERY; my_message(err, ER(err), MYF(0)); + } } /* return TRUE if we will abort query if we make a warning now */ inline bool really_abort_on_warning() |