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/log.cc | |
parent | 3769841d9e706ee018d5273d2901954b9a281c3e (diff) | |
parent | 0db9c26b05439f9d6fc29234966f50d8e393dfe2 (diff) | |
download | mariadb-git-3fb22ac5e146e1fe34d282c3c3ef6bd50af90ca5.tar.gz |
Merge with 5.2
Diffstat (limited to 'sql/log.cc')
-rw-r--r-- | sql/log.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index d345d0f6102..e53c8d12770 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -5175,7 +5175,8 @@ int query_error_code(THD *thd, bool not_killed) is not set to these errors when specified not_killed by the caller. */ - if (error == ER_SERVER_SHUTDOWN || error == ER_QUERY_INTERRUPTED) + if (error == ER_SERVER_SHUTDOWN || error == ER_QUERY_INTERRUPTED || + error == ER_NEW_ABORTING_CONNECTION) error= 0; } else |