diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:49:15 +0300 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:49:15 +0300 |
commit | 19c8976d854ecdd6ee50eeb58d3b4931998da8c7 (patch) | |
tree | 194a77b0bf65d6017a0c39741d151dafb8b5716d /sql/opt_index_cond_pushdown.cc | |
parent | da5edf5057d392f3647570606220d80106c81a7b (diff) | |
parent | 26d675c638ab52cdbc7a6dc259da84a3a4ab26b9 (diff) | |
download | mariadb-git-19c8976d854ecdd6ee50eeb58d3b4931998da8c7.tar.gz |
Merge MWL#67: MRR Backport and BKA backport.
Diffstat (limited to 'sql/opt_index_cond_pushdown.cc')
-rw-r--r-- | sql/opt_index_cond_pushdown.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/opt_index_cond_pushdown.cc b/sql/opt_index_cond_pushdown.cc index a365698485f..277343b81a5 100644 --- a/sql/opt_index_cond_pushdown.cc +++ b/sql/opt_index_cond_pushdown.cc @@ -319,9 +319,6 @@ void push_index_cond(JOIN_TAB *tab, uint keyno, bool other_tbls_ok) { Item *idx_remainder_cond= 0; tab->pre_idx_push_select_cond= tab->select_cond; -#if 0 - /* - psergey: enable the below when we backport BKA: */ /* For BKA cache we store condition to special BKA cache field because evaluation of the condition requires additional operations @@ -340,7 +337,6 @@ void push_index_cond(JOIN_TAB *tab, uint keyno, bool other_tbls_ok) ~(tab->table->map | tab->join->const_table_map))) tab->cache_idx_cond= idx_cond; else -#endif idx_remainder_cond= tab->table->file->idx_cond_push(keyno, idx_cond); /* |