diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-09-04 11:39:58 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-09-04 11:39:58 +0200 |
| commit | 259689f87f787a99c28a16026096be8feb43917b (patch) | |
| tree | 2f274201cf4e71a67a4784565729438e314b9da0 /sql/sql_yacc.yy | |
| parent | 3dd1ef7bb6eec7db070d3b8917b5146aac60f59c (diff) | |
| parent | efa8e33075d13f4a96f8d4659134f905e71a9f1a (diff) | |
| download | mariadb-git-259689f87f787a99c28a16026096be8feb43917b.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-opt
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index cca41176be9..f98e4a708da 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -8954,8 +8954,10 @@ subselect_end: { LEX *lex=Lex; lex->pop_context(); + SELECT_LEX *child= lex->current_select; lex->current_select = lex->current_select->return_after_parsing(); lex->nest_level--; + lex->current_select->n_child_sum_items += child->n_sum_items; }; /************************************************************************** |