diff options
| author | Igor Babaev <igor@askmonty.org> | 2014-02-10 17:00:51 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2014-02-10 17:00:51 -0800 |
| commit | f17079fa7eff75ed831ebe09b22046b7d4b017e3 (patch) | |
| tree | d2573cd6ebd7b61e1540c35db78744d07ecf73f2 /sql/sql_select.cc | |
| parent | 41fd4844e8492880f9139cd9f10992a3dac390df (diff) | |
| parent | 3845a89b01ee0fa83812f5e3ac6b39b25da03d3d (diff) | |
| download | mariadb-git-f17079fa7eff75ed831ebe09b22046b7d4b017e3.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5d7594bf3d7..43ffb8bb084 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3610,6 +3610,7 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list, if (conds && const_count) { conds= remove_eq_conds(join->thd, conds, &join->cond_value); + join->select_lex->where= conds; if (join->cond_value == Item::COND_FALSE) { join->impossible_where= true; @@ -10848,7 +10849,7 @@ void JOIN::cleanup(bool full) } if (full) { - cleanup_empty_jtbm_semi_joins(this); + cleanup_empty_jtbm_semi_joins(this, join_list); /* Ensure that the following delete_elements() would not be called twice for the same list. |