diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-07-25 07:57:47 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-07-25 07:57:47 -0600 |
| commit | cf81182cd038f9a0a038019629a67fbd386cb2c2 (patch) | |
| tree | 22546341a58186ccbb98439b25d45dea15aa4253 | |
| parent | 607ab14cf767ed0187e0c050ed61cb4ebaf34bb7 (diff) | |
| parent | 04fc8b71d66810df6784876d58fe3a5e534b2ac4 (diff) | |
| download | mariadb-git-cf81182cd038f9a0a038019629a67fbd386cb2c2.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.0-29959
| -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 6fbd521e302..d71e756e91c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5567,7 +5567,7 @@ join_table: so that [INNER | CROSS] JOIN is properly nested as other left-associative joins. */ - table_ref %prec TABLE_REF_PRIORITY normal_join table_ref + table_ref normal_join table_ref %prec TABLE_REF_PRIORITY { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); } | table_ref STRAIGHT_JOIN table_factor { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); $3->straight=1; } |