diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-18 22:03:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-18 22:03:02 +0100 |
| commit | ab476a8d107b3e5b591944b2b5eb3a21d6d003a1 (patch) | |
| tree | 966c077afce804cbaf0fc46ecab09c3d1da36a13 /sql/sql_yacc.yy | |
| parent | f91798dd1c9e178061ba58c88a42b9cb3701385d (diff) | |
| parent | 43a5090980ac0ab9695587979b9068b6bf849d64 (diff) | |
| download | mariadb-git-ab476a8d107b3e5b591944b2b5eb3a21d6d003a1.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c6797278e02..8e849d76070 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -10763,6 +10763,15 @@ table_factor: sel->add_joined_table($$); lex->pop_context(); lex->nest_level--; + /* + Fields in derived table can be used in upper select in + case of merge. We do not add HAVING fields because we do + not merge such derived. We do not add union because + also do not merge them + */ + if (!sel->next_select()) + $2->select_n_where_fields+= + sel->select_n_where_fields; } /*else if (($3->select_lex && $3->select_lex->master_unit()->is_union() && |