summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-07-19 15:52:19 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-07-19 15:52:19 +0400
commitab70b76d9c4eaafde3a4c639bd280d2ccb1d2999 (patch)
treeb96053e78a1e7fcb36a8fa17a31ec9478bc84ca7 /sql/sql_select.h
parent678b4f5dea6edb146fc1877b384d602f5afcac03 (diff)
downloadmariadb-git-ab70b76d9c4eaafde3a4c639bd280d2ccb1d2999.tar.gz
BUG#992942 & MDEV-325: Pre-liminary commit for testing
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index b78ac10d35f..d0677f069e7 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -903,6 +903,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
@@ -1293,6 +1301,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,