diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-23 11:55:18 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-23 11:55:18 +0200 |
| commit | 304440b0148e5e23ef35cea0aa00d78069bdc4e5 (patch) | |
| tree | dd1dd8de447b76cb08c9c5430c416b8cab6340d9 /sql | |
| parent | d57ddaa1904d3c2f08460c539c72652f0c78c09a (diff) | |
| parent | 9cea4ccf12cb6e8746b9b440d9c62408a9ef04af (diff) | |
| download | mariadb-git-304440b0148e5e23ef35cea0aa00d78069bdc4e5.tar.gz | |
Merge branch '5.5' into bb-10.0-merge-sanja
Diffstat (limited to 'sql')
| -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 c27f38517df..43b8d2b8636 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3673,8 +3673,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; /* @@ -3839,7 +3839,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, |