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/handler.cc | |
| parent | 3769841d9e706ee018d5273d2901954b9a281c3e (diff) | |
| parent | 0db9c26b05439f9d6fc29234966f50d8e393dfe2 (diff) | |
| download | mariadb-git-3fb22ac5e146e1fe34d282c3c3ef6bd50af90ca5.tar.gz | |
Merge with 5.2
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 751e31fdf9f..905668114dd 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1403,9 +1403,14 @@ int ha_rollback_trans(THD *thd, bool all) slave SQL thread, it would not stop the thread but just be printed in the error log; but we don't want users to wonder why they have this message in the error log, so we don't send it. + + We don't have to test for thd->killed == THD::KILL_SYSTEM_THREAD as + it doesn't matter if a warning is pushed to a system thread or not: + No one will see it... */ if (is_real_trans && thd->transaction.all.modified_non_trans_table && - !thd->slave_thread && thd->killed != THD::KILL_CONNECTION) + !thd->slave_thread && thd->killed != THD::KILL_CONNECTION && + thd->killed != THD::KILL_SERVER) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARNING_NOT_COMPLETE_ROLLBACK, ER(ER_WARNING_NOT_COMPLETE_ROLLBACK)); |