diff options
| author | unknown <serg@serg.mylan> | 2005-06-10 18:02:19 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-10 18:02:19 +0200 |
| commit | 039a01a1ebfbdb4c51fdb01fdbc67aa0de6e11f9 (patch) | |
| tree | 0fae3d2865e9f89671fec71a6da277e49086b9f5 /sql | |
| parent | 19d66f2be1a1ca996b72a359851af509c4483050 (diff) | |
| download | mariadb-git-039a01a1ebfbdb4c51fdb01fdbc67aa0de6e11f9.tar.gz | |
bug#11225 - distinct.test fails
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 33d6c192d07..892d2516808 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5108,11 +5108,11 @@ derived_table_list: join_table: table_ref normal_join table_ref { TEST_ASSERT($1 && ($$=$3)); } - | table_ref STRAIGHT_JOIN table_ref + | table_ref STRAIGHT_JOIN table_factor { TEST_ASSERT($1 && ($$=$3)); $3->straight=1; } | table_ref normal_join table_ref ON expr { TEST_ASSERT($1 && ($$=$3)); add_join_on($3,$5); } - | table_ref STRAIGHT_JOIN table_ref ON expr + | table_ref STRAIGHT_JOIN table_factor ON expr { TEST_ASSERT($1 && ($$=$3)); $3->straight=1; add_join_on($3,$5); } | table_ref normal_join table_ref USING |