summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorSinisa@sinisa.nasamreza.org <>2002-03-07 13:57:52 +0200
committerSinisa@sinisa.nasamreza.org <>2002-03-07 13:57:52 +0200
commite95eb59e9977a93f2dccc6f1a21be08cd8e51f2b (patch)
tree8e32348440474ecc6dbf93fa85b3fe086d5eb8c6 /sql/sql_yacc.yy
parentc00ddbab5477d623ce00046e43fc0573052219e1 (diff)
downloadmariadb-git-e95eb59e9977a93f2dccc6f1a21be08cd8e51f2b.tar.gz
better fix for a bug fix from yesterday
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index b12dd07777f..82ec55e72b0 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1614,7 +1614,7 @@ simple_expr:
| BINARY expr %prec NEG { $$= new Item_func_binary($2); }
| CAST_SYM '(' expr AS cast_type ')' { $$= create_func_cast($3, $5); }
| CASE_SYM opt_expr WHEN_SYM when_list opt_else END
- { $$= new Item_func_case(* $4, $2, $5 ) }
+ { $$= new Item_func_case(* $4, $2, $5 ); }
| CONVERT_SYM '(' expr ',' cast_type ')' { $$= create_func_cast($3, $5); }
| FUNC_ARG0 '(' ')'
{ $$= ((Item*(*)(void))($1.symbol->create_func))();}
@@ -1880,7 +1880,7 @@ sum_expr:
{ $$=new Item_sum_sum($3); }
in_sum_expr:
- { Select->in_sum_expr++ }
+ { Select->in_sum_expr++; }
expr
{
Select->in_sum_expr--;
@@ -1953,7 +1953,7 @@ opt_pad:
join_table_list:
'(' join_table_list ')' { $$=$2; }
| join_table { $$=$1; }
- | join_table_list normal_join join_table { $$=$3 }
+ | join_table_list normal_join join_table { $$=$3; }
| join_table_list STRAIGHT_JOIN join_table { $$=$3 ; $$->straight=1; }
| join_table_list INNER_SYM JOIN_SYM join_table ON expr
{ add_join_on($4,$6); $$=$4; }