diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-11-04 19:09:46 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-11-04 19:09:46 +0400 |
| commit | 39e7072d64f5ff36d61bf81970ec398f8d937cfd (patch) | |
| tree | e7c0ca49db94cb0fbd39198e4dab1fd74b403d79 /sql/sql_select.h | |
| parent | 25b5831a77cd3a8f1b0a1dfdb9ef16d9f33da0b8 (diff) | |
| download | mariadb-git-39e7072d64f5ff36d61bf81970ec398f8d937cfd.tar.gz | |
MDEV-536: LP:1050806 - different result for a query using subquery, and
MDEV-567: Wrong result from a query with correlated subquery if ICP is allowed:
backport the fix developed for SHOW EXPLAIN:
revision-id: psergey@askmonty.org-20120719115219-212cxmm6qvf0wlrb
branch nick: 5.5-show-explain-r21
timestamp: Thu 2012-07-19 15:52:19 +0400
BUG#992942 & MDEV-325: Pre-liminary commit for testing
and adjust it so that it handles DS-MRR scans correctly.
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 118a684ab62..e4687b4f00c 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -897,6 +897,14 @@ protected: public: JOIN_TAB *join_tab, **best_ref; + + /* + Saved join_tab for pre_sorting. create_sort_index() will save here.. + */ + JOIN_TAB *pre_sort_join_tab; + uint pre_sort_index; + Item *pre_sort_idx_pushed_cond; + void clean_pre_sort_join_tab(); /* For "Using temporary+Using filesort" queries, JOIN::join_tab can point to @@ -1279,6 +1287,8 @@ public: outer_ref_cond= pseudo_bits_cond= NULL; in_to_exists_where= NULL; in_to_exists_having= NULL; + + pre_sort_join_tab= NULL; } int prepare(Item ***rref_pointer_array, TABLE_LIST *tables, uint wind_num, |