diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-01-12 08:11:52 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-01-12 08:11:52 -0700 |
| commit | 8e9c245ac3dd5fbcf72503aa927a3aa9a8ef433b (patch) | |
| tree | c8c74cbb5c220afe7996fa67459b45106a3abeb1 /sql/sql_yacc.yy | |
| parent | 3d904a85b1ef5e0cf71be734de5f12440e3fc5a9 (diff) | |
| parent | 6bc937450411980032b7aea23643053878cfb36d (diff) | |
| download | mariadb-git-8e9c245ac3dd5fbcf72503aa927a3aa9a8ef433b.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-22687
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
BitKeeper/deleted/.del-item_uniq.cc:
Auto merged
BitKeeper/deleted/.del-item_uniq.h:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d541724a133..841c0f19c1e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -536,7 +536,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token GRANTS %token GROUP /* SQL-2003-R */ %token GROUP_CONCAT_SYM -%token GROUP_UNIQUE_USERS %token GT_SYM /* OPERATOR */ %token HANDLER_SYM %token HASH_SYM @@ -870,7 +869,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token UNINSTALL_SYM %token UNION_SYM /* SQL-2003-R */ %token UNIQUE_SYM -%token UNIQUE_USERS %token UNKNOWN_SYM /* SQL-2003-R */ %token UNLOCK_SYM %token UNSIGNED @@ -6348,10 +6346,6 @@ simple_expr: } $$= new (YYTHD->mem_root) Item_func_interval((Item_row *)$1); } - | UNIQUE_USERS '(' text_literal ',' NUM ',' NUM ',' expr_list ')' - { - $$= new Item_func_unique_users($3,atoi($5.str),atoi($7.str), * $9); - } ; /* @@ -6838,8 +6832,6 @@ sum_expr: { Select->in_sum_expr--; } ')' { $$=new Item_sum_count_distinct(* $5); } - | GROUP_UNIQUE_USERS '(' text_literal ',' NUM ',' NUM ',' in_sum_expr ')' - { $$= new Item_sum_unique_users($3,atoi($5.str),atoi($7.str),$9); } | MIN_SYM '(' in_sum_expr ')' { $$=new Item_sum_min($3); } /* |