diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-09-10 09:37:55 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-09-10 09:37:55 +0300 |
| commit | 0db9c26b05439f9d6fc29234966f50d8e393dfe2 (patch) | |
| tree | a4cd07574058b941790e187df5c63d9fafe4a2eb /sql/sql_connect.cc | |
| parent | b80641b36cb43206a118ee84fccd90d08fbb8df4 (diff) | |
| parent | 8fb10c24d74cbddbfd6da0b5f4ea9409f8f88e57 (diff) | |
| download | mariadb-git-0db9c26b05439f9d6fc29234966f50d8e393dfe2.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index be53c60e8ca..ec9ea31d0a4 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -1180,7 +1180,8 @@ pthread_handler_t handle_one_connection(void *arg) prepare_new_connection_state(thd); while (!net->error && net->vio != 0 && - !(thd->killed == THD::KILL_CONNECTION)) + thd->killed != THD::KILL_CONNECTION && + thd->killed != THD::KILL_SERVER) { if (do_command(thd)) break; |