diff options
| author | unknown <sanja@askmonty.org> | 2012-12-23 20:57:54 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2012-12-23 20:57:54 +0200 |
| commit | 40ae63dd65fb9e812f29d3520acb0ba6b64d3005 (patch) | |
| tree | a11cd4a7bc7660d1d2159497469f32e4f8d177f4 /sql/sql_yacc.yy | |
| parent | 28c9e1a550bc9f2c2dbb28304d22552ea944cf07 (diff) | |
| download | mariadb-git-40ae63dd65fb9e812f29d3520acb0ba6b64d3005.tar.gz | |
backport to 5.5 dyncol changes and names support
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 48dd47bccea..87a7df34986 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -885,10 +885,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token COLUMN_CHECK_SYM %token COLUMN_CREATE_SYM %token COLUMN_DELETE_SYM -%token COLUMN_EXISTS_SYM %token COLUMN_GET_SYM -%token COLUMN_JSON_SYM -%token COLUMN_LIST_SYM %token COLUMN_SYM /* SQL-2003-R */ %token COLUMN_NAME_SYM /* SQL-2003-N */ %token COMMENT_SYM @@ -8808,20 +8805,6 @@ function_call_nonkeyword: MYSQL_YYABORT; } | - COLUMN_EXISTS_SYM '(' expr ',' expr ')' - { - $$= new (YYTHD->mem_root) Item_func_dyncol_exists($3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | - COLUMN_LIST_SYM '(' expr ')' - { - $$= new (YYTHD->mem_root) Item_func_dyncol_list($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COLUMN_CREATE_SYM '(' dyncall_create_list ')' { $$= create_func_dyncol_create(YYTHD, *$3); @@ -8829,13 +8812,6 @@ function_call_nonkeyword: MYSQL_YYABORT; } | - COLUMN_JSON_SYM '(' expr ')' - { - $$= create_func_dyncol_json(YYTHD, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COLUMN_GET_SYM '(' expr ',' expr AS cast_type ')' { LEX *lex= Lex; @@ -12927,10 +12903,7 @@ keyword: | COLUMN_CHECK_SYM {} | COLUMN_CREATE_SYM {} | COLUMN_DELETE_SYM {} - | COLUMN_EXISTS_SYM {} | COLUMN_GET_SYM {} - | COLUMN_JSON_SYM {} - | COLUMN_LIST_SYM {} | COMMENT_SYM {} | COMMIT_SYM {} | CONTAINS_SYM {} |