1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-02 14:22:51 +03:00

- Update test results (trivial)

- Code cleanup: remove garbage comments
This commit is contained in:
Sergey Petrunya
2011-05-29 01:47:24 +04:00
parent 6f17421c27
commit ded7342daa
4 changed files with 2 additions and 35 deletions

View File

@ -785,7 +785,6 @@ inject_jtbm_conds(JOIN *join, List<TABLE_LIST> *join_list, Item **join_where)
double rows;
double read_time;
// psergey-merge: disable IN->EXISTS for JTBM subqueries, for now.
subq_pred->in_strategy &= ~SUBS_IN_TO_EXISTS;
subq_pred->optimize(&rows, &read_time);
@ -908,7 +907,6 @@ JOIN::optimize()
thd->restore_active_arena(arena, &backup);
}
//psergey-merge
inject_jtbm_conds(this, join_list, &conds);
conds= optimize_cond(this, conds, join_list, &cond_value, &cond_equal);