diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
| commit | 7cd11f45beeb162db84dea423a040a296ac2856e (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /sql/sql_class.h | |
| parent | 5462a6dbcc68d51a89356255fb4f398be7d62c27 (diff) | |
| parent | 3e2c9aac11a95d8cbb61e1937e4ebe18c7e86698 (diff) | |
| download | mariadb-git-7cd11f45beeb162db84dea423a040a296ac2856e.tar.gz | |
Manual merge from mysql-trunk-merge.
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 f72736ab692..255d7a4d63a 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -55,6 +55,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) @@ -2034,7 +2036,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() |