diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
| commit | cb5952b5060d089c021808fe1f1cf13f7eb88423 (patch) | |
| tree | 1e4678bd3b899428428b4f7980b92fade8e57f62 /sql/sql_select.cc | |
| parent | 57cde8ccd19675dc98e3cbacf0ef5c72cb188e49 (diff) | |
| parent | 9fbe360e9f7d41d169eb5abed22dc15f26f6c749 (diff) | |
| download | mariadb-git-cb5952b5060d089c021808fe1f1cf13f7eb88423.tar.gz | |
Merge branch '10.0' into bb-10.1-merge-sanja
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e3b725ce1f6..534ba8bf700 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3823,8 +3823,8 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list, int ref_changed; do { - more_const_tables_found: ref_changed = 0; + more_const_tables_found: found_ref=0; /* @@ -3991,7 +3991,7 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list, } } } - } while (join->const_table_map & found_ref && ref_changed); + } while (ref_changed); join->sort_by_table= get_sort_by_table(join->order, join->group_list, join->select_lex->leaf_tables, |