diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
| commit | 30df032e28bada8aabc1c850799795c728cd96b7 (patch) | |
| tree | 4d7d8b6e481197bcd1cf04368d7c19316b047527 /sql/sql_join_cache.cc | |
| parent | 79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff) | |
| parent | 4d8be2d4f6d7a7b669b7931f1a0ccb5de130fee6 (diff) | |
| download | mariadb-git-30df032e28bada8aabc1c850799795c728cd96b7.tar.gz | |
SHOW EXPLAIN: merge with 5.5-main
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 91a98d8c6f1..4148842a826 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -2236,7 +2236,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(); @@ -2506,7 +2506,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(); @@ -3356,7 +3356,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 |