diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-10 13:00:08 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-10 13:00:08 -0500 |
| commit | ca07ee85ea28d4b820498535508c6b23f089c22c (patch) | |
| tree | 1445f647e7b3237031b04339b5be69a183e761eb /sql/sql_yacc.yy | |
| parent | 278ff1661a9fcf690b6b7604eb889fd287e6246a (diff) | |
| parent | d67aacb4fbb449ffa8db4e3d70fe8756d62b5222 (diff) | |
| download | mariadb-git-ca07ee85ea28d4b820498535508c6b23f089c22c.tar.gz | |
Merge tag 'mariadb-5.5.47' into 5.5-galera
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 7a72c20c814..2b9647cc043 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9878,6 +9878,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() && |