diff options
| author | igor@rurik.mysql.com <> | 2006-05-17 17:20:03 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2006-05-17 17:20:03 -0700 |
| commit | 0d069edaa2a21b9eaf2dc3bc529fa85644279cdf (patch) | |
| tree | 09aab8bce9fa9fffaccc108f03eab88b9023a908 /sql/sql_yacc.yy | |
| parent | 4ab4c99eff759756b0aefc78ecb44199baba6b38 (diff) | |
| parent | a0df09eee2522af50e991796bf16c7e6cdf01024 (diff) | |
| download | mariadb-git-0d069edaa2a21b9eaf2dc3bc529fa85644279cdf.tar.gz | |
Merge rurik.mysql.com:/home/igor/tmp_merge
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 31ef2d8907e..3d3bd3e799d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -475,6 +475,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token NUMERIC_SYM %token NVARCHAR_SYM %token OFFSET_SYM +%token OJ_SYM %token OLD_PASSWORD %token ON %token ONE_SHOT_SYM @@ -6943,11 +6944,14 @@ table_factor: } expr '}' { + LEX *lex= Lex; YYERROR_UNLESS($3 && $7); add_join_on($7,$10); Lex->pop_context(); $7->outer_join|=JOIN_TYPE_LEFT; $$=$7; + if (!($$= lex->current_select->nest_last_join(lex->thd))) + YYABORT; } | select_derived_init get_select_lex select_derived2 { |