diff options
| author | unknown <jimw@mysql.com> | 2005-12-12 11:57:07 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-12-12 11:57:07 -0800 |
| commit | 6a53fec55132c4bb00f994106ba803e538a72bf5 (patch) | |
| tree | a1d498bb5425a813ab13ceed035fe9dd108a616e /sql/sql_yacc.yy | |
| parent | 485a5f69a6f48111edad612f83d1415312f565b8 (diff) | |
| parent | 50bcb9623dd976083ecd62cffbf49c128341763a (diff) | |
| download | mariadb-git-6a53fec55132c4bb00f994106ba803e538a72bf5.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/sp.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_base.cc:
Resolve conflict
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8897e77b372..01dfd9f2f5a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5061,7 +5061,7 @@ simple_expr: } $$= new Item_default_value(Lex->current_context(), $3); } - | VALUES '(' simple_ident ')' + | VALUES '(' simple_ident_nospvar ')' { $$= new Item_insert_value(Lex->current_context(), $3); } | FUNC_ARG0 '(' ')' { @@ -9549,6 +9549,7 @@ subselect_end: LEX *lex=Lex; lex->pop_context(); lex->current_select = lex->current_select->return_after_parsing(); + lex->nest_level--; }; definer: |