summaryrefslogtreecommitdiff
path: root/sql/sql_window.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-02-15 08:43:39 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-02-15 14:09:27 +0200
commitd06a44e027070a65c5cfc0079aa977e73fa12d0e (patch)
tree772fefb7283c524d1be0f2b84fc6823faf0ff6ac /sql/sql_window.cc
parent88ddb1ea4e4c7ce4816026d9a64b3f8b1cc59072 (diff)
downloadmariadb-git-d06a44e027070a65c5cfc0079aa977e73fa12d0e.tar.gz
MDEV-11868: min ( distinct ) over ( ) returns wrong value
The bug was not visible in current HEAD. Introduced test case to catch regressions. Also improve error messages regarding distinct usage in window functions.
Diffstat (limited to 'sql/sql_window.cc')
-rw-r--r--sql/sql_window.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/sql_window.cc b/sql/sql_window.cc
index eb06824402d..557c7503306 100644
--- a/sql/sql_window.cc
+++ b/sql/sql_window.cc
@@ -2699,10 +2699,20 @@ bool Window_func_runner::add_function_to_run(Item_window_func *win_func)
{
/* Distinct is not yet supported. */
case Item_sum::GROUP_CONCAT_FUNC:
+ my_error(ER_NOT_SUPPORTED_YET, MYF(0),
+ "GROUP_CONCAT() aggregate as window function");
+ return true;
case Item_sum::SUM_DISTINCT_FUNC:
+ my_error(ER_NOT_SUPPORTED_YET, MYF(0),
+ "SUM(DISTINCT) aggregate as window function");
+ return true;
case Item_sum::AVG_DISTINCT_FUNC:
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
- "This aggregate as window function");
+ "AVG(DISTINCT) aggregate as window function");
+ return true;
+ case Item_sum::COUNT_DISTINCT_FUNC:
+ my_error(ER_NOT_SUPPORTED_YET, MYF(0),
+ "COUNT(DISTINCT) aggregate as window function");
return true;
default:
break;