diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-05-17 00:59:03 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-05-17 00:59:03 +0400 |
| commit | 34e9a4c1e29df65ca0d98715748daa4318b23c2b (patch) | |
| tree | 7e47d3ba3d52eacf2f966657c348480d0b130e07 /sql/sql_join_cache.cc | |
| parent | dfbd777fd83d236cc559750048f0cabee87d93a0 (diff) | |
| parent | 483ae4bf81851a16e27cfc67b0eb474fed0a97dd (diff) | |
| download | mariadb-git-34e9a4c1e29df65ca0d98715748daa4318b23c2b.tar.gz | |
Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}
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 f953cf4df57..d0c77496694 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 |