diff options
| author | unknown <serg@serg.mylan> | 2003-07-15 14:58:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-07-15 14:58:04 +0200 |
| commit | 5aa330863bad40282cd26feb3bacf105f785032c (patch) | |
| tree | f96f1bb78939f05b9e3cfc29c02f3823b908475c /sql/sql_yacc.yy | |
| parent | 5c0075496ec02ab882cd5e8b5e12a4e159d92047 (diff) | |
| parent | 4b3eecf46b640b3601527ea59d819ddaec5820f8 (diff) | |
| download | mariadb-git-5aa330863bad40282cd26feb3bacf105f785032c.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_func.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, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index eaa4de71f7d..dc68d0165fd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2427,7 +2427,7 @@ simple_expr: $$= new Item_func_date_format (new Item_func_from_unixtime($3),$5,0); } | FIELD_FUNC '(' expr ',' expr_list ')' - { $$= new Item_func_field($3, *$5); } + { $5->push_front($3); $$= new Item_func_field(*$5); } | GEOMFROMTEXT '(' expr ')' { $$= new Item_func_geometry_from_text($3); } | GEOMFROMTEXT '(' expr ',' expr ')' |