summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption/r
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-02-25 13:00:48 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-02-25 13:00:48 +0200
commitf5ff7d09c73b5527cb6e0540cd470db9d8a82108 (patch)
tree23728ff9752891cb78060ed748a3fc8bb7381c40 /mysql-test/suite/encryption/r
parent0eabc285a3c0cf0285d569a29c549634238fbdae (diff)
parent9ba385a50d0cd611fce61462fc3e03e82b1ffee9 (diff)
downloadmariadb-git-f5ff7d09c73b5527cb6e0540cd470db9d8a82108.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/encryption/r')
-rw-r--r--mysql-test/suite/encryption/r/tempfiles_encrypted.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/encryption/r/tempfiles_encrypted.result b/mysql-test/suite/encryption/r/tempfiles_encrypted.result
index de9820184a5..a92a3a04a1a 100644
--- a/mysql-test/suite/encryption/r/tempfiles_encrypted.result
+++ b/mysql-test/suite/encryption/r/tempfiles_encrypted.result
@@ -4236,6 +4236,14 @@ i LAST_VALUE(COUNT(i)) OVER (PARTITION BY i ORDER BY j)
4 2
DROP TABLE t1;
#
+# MDEV-15208: server crashed, when using ORDER BY with window function and UNION
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(1),(1),(1),(1),(2),(2),(2),(2),(2),(2);
+SELECT 1 UNION SELECT a FROM t1 ORDER BY (row_number() over ());
+ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to a UNION
+DROP TABLE t1;
+#
# End of 10.2 tests
#
#