summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarunraiko <varunraiko1803@gmail.com>2016-08-13 01:30:18 +0530
committervarunraiko <varunraiko1803@gmail.com>2016-08-13 01:30:18 +0530
commitfebbe0822c855904e78572b2954a10db55d5d362 (patch)
tree5e381b6575439493106f17629a70e18b40d88a16
parent120ac268a09265e05330ec23a075edf837b0b968 (diff)
downloadmariadb-git-bb-MDEV-7773.tar.gz
error added to the agg_parsing test ER_NOT_AGGREGATE_FUNCTIONbb-MDEV-7773
-rw-r--r--mysql-test/r/agg_parsing.result2
-rw-r--r--mysql-test/t/agg_functions_sum.test15
2 files changed, 1 insertions, 16 deletions
diff --git a/mysql-test/r/agg_parsing.result b/mysql-test/r/agg_parsing.result
index 5e4298b7b5b..31ba6dcc9a2 100644
--- a/mysql-test/r/agg_parsing.result
+++ b/mysql-test/r/agg_parsing.result
@@ -4,7 +4,7 @@ set x=5;
fetch group next row;
return x+1;
end |
-ERROR HY000: FETCH GROUP NEXT ROW instruction is only allowed in aggregate functions
+ERROR HY000: Non-aggregate function contains aggregate specific instructions: (FETCH GROUP NEXT ROW)
create aggregate function agg_increm() returns INT
begin
declare z int default 0;
diff --git a/mysql-test/t/agg_functions_sum.test b/mysql-test/t/agg_functions_sum.test
deleted file mode 100644
index da0f959a058..00000000000
--- a/mysql-test/t/agg_functions_sum.test
+++ /dev/null
@@ -1,15 +0,0 @@
-DELIMITER $$;
-CREATE AGGREGATE FUNCTION total_sum(x DOUBLE) RETURNS DOUBLE
-BEGIN
- DECLARE sum DOUBLE DEFAULT 0;
- DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' RETURN sum;
- LOOP
- FETCH GROUP NEXT ROW;
- SET sum=sum+x;
- END LOOP;
-END
-$$
-DELIMITER ;$$
-
-show create function total_sum;
-DROP function total_sum;