diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-09-02 14:57:05 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-09-02 14:57:05 +0200 |
| commit | 4f10d0918d91a98ba46e095fbe775409d3ce0d41 (patch) | |
| tree | 93c4ad3e7c7b349bda788659f7bc314f0faca519 /sql/sql_yacc_ora.yy | |
| parent | 3ca68794c040041decd8d1bfaff20e49b2c85df3 (diff) | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| download | mariadb-git-4f10d0918d91a98ba46e095fbe775409d3ce0d41.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_yacc_ora.yy')
| -rw-r--r-- | sql/sql_yacc_ora.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index e04554d4e88..aac2e009696 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -5480,10 +5480,10 @@ part_column_list: part_func: - '(' remember_name part_func_expr remember_end ')' + '(' part_func_expr ')' { partition_info *part_info= Lex->part_info; - if (unlikely(part_info->set_part_expr(thd, $2 + 1, $3, $4, FALSE))) + if (unlikely(part_info->set_part_expr(thd, $2, FALSE))) MYSQL_YYABORT; part_info->num_columns= 1; part_info->column_list= FALSE; @@ -5491,9 +5491,9 @@ part_func: ; sub_part_func: - '(' remember_name part_func_expr remember_end ')' + '(' part_func_expr ')' { - if (unlikely(Lex->part_info->set_part_expr(thd, $2 + 1, $3, $4, TRUE))) + if (unlikely(Lex->part_info->set_part_expr(thd, $2, TRUE))) MYSQL_YYABORT; } ; |