diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-26 10:14:34 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-26 10:14:34 +0200 |
| commit | 278fbe61d847337712c0f802cc8e0db85bf58bd7 (patch) | |
| tree | ed1e793f1dbc6e86b43b0e916657a8937326f6dd | |
| parent | fa5f26b422531c449e6a0c464865226af3b24636 (diff) | |
| download | mariadb-git-278fbe61d847337712c0f802cc8e0db85bf58bd7.tar.gz | |
Add skipped changes to oracle mode parser.
| -rw-r--r-- | sql/sql_yacc_ora.yy | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index bcb6c982da3..ec8e4f4c946 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -5954,10 +5954,11 @@ opt_part_option: opt_versioning_rotation: /* empty */ {} - | INTERVAL_SYM expr interval opt_versioning_interval_start + | { Lex->expr_allows_subselect= false; } + INTERVAL_SYM expr interval opt_versioning_interval_start { partition_info *part_info= Lex->part_info; - if (unlikely(part_info->vers_set_interval(thd, $2, $3, $4))) + if (unlikely(part_info->vers_set_interval(thd, $3, $4, $5))) MYSQL_YYABORT; } | LIMIT ulonglong_num @@ -12866,11 +12867,16 @@ order_clause: */ DBUG_ASSERT(sel->master_unit()->fake_select_lex); lex->current_select= sel->master_unit()->fake_select_lex; + lex->push_context(&sel->master_unit()->fake_select_lex->context, thd->mem_root); } } order_list { - + if (Lex->current_select == + Lex->current_select->master_unit()->fake_select_lex) + { + Lex->pop_context(); + } } ; |