diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-04-26 07:17:34 +0530 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-04-26 07:17:34 +0530 |
| commit | 9b269ea11b49c186a12f1a877c1d7cfa26b8b5c1 (patch) | |
| tree | 0c8789d4b801bd84b9d901776154a4c504bbdea6 /sql/sql_join_cache.cc | |
| parent | ca8aa3901c5596d8d393f0f0ded5ea7292ed01c8 (diff) | |
| download | mariadb-git-9b269ea11b49c186a12f1a877c1d7cfa26b8b5c1.tar.gz | |
MWL#182: Explain running statements
- Correct thd->killed checks in join cache and filesort modules.
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index d49be2e446c..6492fb6cd61 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -2235,7 +2235,7 @@ enum_nested_loop_state JOIN_CACHE::join_matching_records(bool skip_last) while (!(error= join_tab_scan->next())) { - if (join->thd->killed) + if (join->thd->check_killed()) { /* The user has aborted the execution of the query */ join->thd->send_kill_message(); @@ -2505,7 +2505,7 @@ enum_nested_loop_state JOIN_CACHE::join_null_complements(bool skip_last) for ( ; cnt; cnt--) { - if (join->thd->killed) + if (join->thd->check_killed()) { /* The user has aborted the execution of the query */ join->thd->send_kill_message(); @@ -3355,7 +3355,7 @@ int JOIN_TAB_SCAN::next() update_virtual_fields(thd, table); while (!err && select && (skip_rc= select->skip_record(thd)) <= 0) { - if (thd->killed || skip_rc < 0) + if (thd->check_killed() || skip_rc < 0) return 1; /* Move to the next record if the last retrieved record does not |