diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-06-20 16:57:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-06-20 16:57:21 +0400 |
| commit | 4b821e02f6e4b8008a7f101921b0d659dd1459c4 (patch) | |
| tree | d0a5ce7f839751bf7c1e4c92962662c6629959f1 /sql/sql_select.cc | |
| parent | bb24663f5ad955a615172512c04779d219bb6645 (diff) | |
| parent | 6c08ff3eb71104cf1e9cfcbe01eca4afe281ccb1 (diff) | |
| download | mariadb-git-4b821e02f6e4b8008a7f101921b0d659dd1459c4.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.1
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 2f2780d7358..31bd5ed527e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9791,7 +9791,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) table_map current_map; i= join->const_tables; for (tab= first_depth_first_tab(join); tab; - tab= next_depth_first_tab(join, tab), i++) + tab= next_depth_first_tab(join, tab)) { bool is_hj; /* @@ -10275,6 +10275,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) } first_inner_tab= first_inner_tab->first_upper; } + if (!tab->bush_children) + i++; } } DBUG_RETURN(0); |