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_connect.cc | |
| parent | 3769841d9e706ee018d5273d2901954b9a281c3e (diff) | |
| parent | 0db9c26b05439f9d6fc29234966f50d8e393dfe2 (diff) | |
| download | mariadb-git-3fb22ac5e146e1fe34d282c3c3ef6bd50af90ca5.tar.gz | |
Merge with 5.2
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 f6bfe975d51..5b7d392d773 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -1181,7 +1181,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; |