diff options
author | unknown <bell@sanja.is.com.ua> | 2003-07-16 13:58:11 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-07-16 13:58:11 +0300 |
commit | eba0a3aaadc3c82a87c60d6c58957ad776fba2ff (patch) | |
tree | 0db6e9b2aef22fadbddd32579f248502e6d9f1b8 /sql/sql_yacc.yy | |
parent | 6d7c4021f8312ac0e0727b73ffba671384f23af3 (diff) | |
parent | a41a43f99d053b96821d0c7388126ca581146933 (diff) | |
download | mariadb-git-eba0a3aaadc3c82a87c60d6c58957ad776fba2ff.tar.gz |
merge
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 768386b1a53..77ae455a8c5 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2109,9 +2109,9 @@ all_or_any: ALL { $$ = 1; } /* expressions that begin with 'expr' */ expr_expr: expr IN_SYM '(' expr_list ')' - { $$= new Item_func_in($1,*$4); } + { $4->push_front($1); $$= new Item_func_in(*$4); } | expr NOT IN_SYM '(' expr_list ')' - { $$= new Item_func_not(new Item_func_in($1,*$5)); } + { $5->push_front($1); $$= new Item_func_not(new Item_func_in(*$5)); } | expr IN_SYM in_subselect { $$= new Item_in_subselect(YYTHD, $1, $3); } | expr NOT IN_SYM in_subselect @@ -2211,9 +2211,9 @@ no_in_expr: /* expressions that begin with 'expr' that does NOT follow AND */ no_and_expr: no_and_expr IN_SYM '(' expr_list ')' - { $$= new Item_func_in($1,*$4); } + { $4->push_front($1); $$= new Item_func_in(*$4); } | no_and_expr NOT IN_SYM '(' expr_list ')' - { $$= new Item_func_not(new Item_func_in($1,*$5)); } + { $5->push_front($1); $$= new Item_func_not(new Item_func_in(*$5)); } | no_and_expr IN_SYM in_subselect { $$= new Item_in_subselect(YYTHD, $1, $3); } | no_and_expr NOT IN_SYM in_subselect @@ -2389,7 +2389,7 @@ simple_expr: | DAY_SYM '(' expr ')' { $$= new Item_func_dayofmonth($3); } | ELT_FUNC '(' expr ',' expr_list ')' - { $$= new Item_func_elt($3, *$5); } + { $5->push_front($3); $$= new Item_func_elt(*$5); } | MAKE_SET_SYM '(' expr ',' expr_list ')' { $$= new Item_func_make_set($3, *$5); } | ENCRYPT '(' expr ')' @@ -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 ')' |