diff options
| author | Monty <monty@mariadb.org> | 2018-05-26 16:57:18 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-05-27 19:47:17 +0300 |
| commit | 58721c3e38f1d5cd9261c6da205126cf0ae2ab24 (patch) | |
| tree | 53d3a77617ca85823b5cae33eb257749990df2cc /sql/sql_join_cache.cc | |
| parent | b3a27618073c74ec5dbf0eeb57afeecf7e8bfa1c (diff) | |
| download | mariadb-git-58721c3e38f1d5cd9261c6da205126cf0ae2ab24.tar.gz | |
MDEV-16286 Killed CREATE SEQUENCE leaves sequence in unusable state
Fixed by deleting the sequence if we where not able to initialize it
I also noticed that we didn't always set the error message when
check_killed(), which could lead to aborted queries without error
beeing properly set. Fixed by default setting error message if
check_error() noticed that killed had been called.
This allowed me to remove a lot of calls to thd->send_kill_message().
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index b8231c6285b..53c5e992ca9 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -2262,7 +2262,6 @@ enum_nested_loop_state JOIN_CACHE::join_matching_records(bool skip_last) if (unlikely(join->thd->check_killed())) { /* The user has aborted the execution of the query */ - join->thd->send_kill_message(); rc= NESTED_LOOP_KILLED; goto finish; } @@ -2536,7 +2535,6 @@ enum_nested_loop_state JOIN_CACHE::join_null_complements(bool skip_last) if (unlikely(join->thd->check_killed())) { /* The user has aborted the execution of the query */ - join->thd->send_kill_message(); rc= NESTED_LOOP_KILLED; goto finish; } |