diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-16 17:35:49 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-16 17:35:49 +0200 |
| commit | 22da65838d96f2fd40a40451579ad18e1a31f79d (patch) | |
| tree | 2df566fe70f19f7a99dd06d250c5fce2e4a6a5bd /sql/sql_yacc.yy | |
| parent | e1f771b23e6e87da26ed152e8f49c763c2cf8ecd (diff) | |
| parent | 16a810f0cb84c78ff365a0742729da6ea5fcff35 (diff) | |
| download | mariadb-git-22da65838d96f2fd40a40451579ad18e1a31f79d.tar.gz | |
merge
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0f9147b7834..dc7d3d55110 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3249,8 +3249,13 @@ select_derived: YYABORT; mysql_init_select(lex); lex->current_select->linkage= DERIVED_TABLE_TYPE; + lex->current_select->parsing_place= SELECT_LEX_NODE::SELECT_LIST; + } + select_options select_item_list + { + Select->parsing_place= SELECT_LEX_NODE::NO_MATTER; } - select_options select_item_list opt_select_from union_opt + opt_select_from union_opt ; opt_outer: |