diff options
| author | pem@mysql.com <> | 2002-10-12 11:07:54 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2002-10-12 11:07:54 +0200 |
| commit | 8bd61c3fce74238b8459359a8c9ec588af1b7dc1 (patch) | |
| tree | 5641e008c029695fb907d1fb0ebc457d1fe957e8 /sql/sql_yacc.yy | |
| parent | 3805a5edfeee171a5dd1945f4f44ea67a00fdb29 (diff) | |
| download | mariadb-git-8bd61c3fce74238b8459359a8c9ec588af1b7dc1.tar.gz | |
Task 430: Allowing braces in joins by simply removing them.
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".
This should fix the bug reported as:
Subject: ODBC SQL syntax issue
From: Ivan Vazharov
Date: Mon, 30 Sep 2002 12:02:42 +0200
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c0b804df17e..f9a24a31eac 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2026,7 +2026,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_list { $$=$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; } @@ -3307,6 +3307,7 @@ option_value: { Lex->var_list.push_back(new set_var_password($3,$5)); } + ; internal_variable_name: ident @@ -3316,6 +3317,7 @@ internal_variable_name: YYABORT; $$=tmp; } + ; isolation_types: READ_SYM UNCOMMITTED_SYM { $$= ISO_READ_UNCOMMITTED; } @@ -3674,6 +3676,7 @@ require_clause: /* empty */ { Lex->ssl_type=SSL_TYPE_NONE; } + ; grant_options: /* empty */ {} |