diff options
| author | unknown <svoj@mysql.com> | 2005-02-27 13:33:20 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-02-27 13:33:20 +0400 |
| commit | 87a48cdf0dd01067c2065cdcb8adfeaed4a8da2f (patch) | |
| tree | a1553480be766302efcc38434f26bf8f25d986f1 /sql/sql_yacc.yy | |
| parent | 8167f5e5ed35f1df7c2c32e126f0aa4e1d48c07a (diff) | |
| parent | d339dd13cdb7fea28bc3800328bb74fd68fb4683 (diff) | |
| download | mariadb-git-87a48cdf0dd01067c2065cdcb8adfeaed4a8da2f.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/stddev-mysql-5.0
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3b03b66c61e..45c3e94f0ff 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -561,6 +561,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token START_SYM %token STATUS_SYM %token STD_SYM +%token STDDEV_SAMP_SYM %token STOP_SYM %token STORAGE_SYM %token STRAIGHT_JOIN @@ -624,6 +625,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token UTC_DATE_SYM %token UTC_TIMESTAMP_SYM %token UTC_TIME_SYM +%token VAR_SAMP_SYM %token VALUES %token VALUE_SYM %token VARBINARY @@ -4751,9 +4753,13 @@ sum_expr: | MAX_SYM '(' DISTINCT in_sum_expr ')' { $$=new Item_sum_max($4); } | STD_SYM '(' in_sum_expr ')' - { $$=new Item_sum_std($3); } + { $$=new Item_sum_std($3, 0); } | VARIANCE_SYM '(' in_sum_expr ')' - { $$=new Item_sum_variance($3); } + { $$=new Item_sum_variance($3, 0); } + | STDDEV_SAMP_SYM '(' in_sum_expr ')' + { $$=new Item_sum_std($3, 1); } + | VAR_SAMP_SYM '(' in_sum_expr ')' + { $$=new Item_sum_variance($3, 1); } | SUM_SYM '(' in_sum_expr ')' { $$=new Item_sum_sum($3); } | SUM_SYM '(' DISTINCT in_sum_expr ')' |