diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
commit | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (patch) | |
tree | 0d1b90c00ead9bf4e429168d00c0ccb123d1e887 /mysql-test/main | |
parent | 8356fb68c366b7f515f9060d964ee598653756a6 (diff) | |
parent | 56c9b0bca0576985c31f20b46dcb060a01e81a2b (diff) | |
download | mariadb-git-ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main')
-rw-r--r-- | mysql-test/main/group_min_max.result | 20 | ||||
-rw-r--r-- | mysql-test/main/group_min_max.test | 17 | ||||
-rw-r--r-- | mysql-test/main/range_aria_dbt3.result | 13 | ||||
-rw-r--r-- | mysql-test/main/range_aria_dbt3.test | 24 |
4 files changed, 74 insertions, 0 deletions
diff --git a/mysql-test/main/group_min_max.result b/mysql-test/main/group_min_max.result index 083b3eabeee..af9f2767a6c 100644 --- a/mysql-test/main/group_min_max.result +++ b/mysql-test/main/group_min_max.result @@ -4066,6 +4066,26 @@ owner_id 1 DROP TABLE t1; # +# MDEV-30240 Wrong result upon aggregate function with SQL_BUFFER_RESULT +# +drop table if exists t1,t2; +Warnings: +Note 1051 Unknown table 'test.t1,test.t2' +CREATE TABLE t1 (pk INT PRIMARY KEY); +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (a INT); +INSERT INTO t2 VALUES (1),(2); +SELECT SQL_BUFFER_RESULT MIN(pk) FROM t1, t2; +MIN(pk) +1 +SELECT MIN(pk) FROM t1, t2; +MIN(pk) +1 +DROP TABLE t1, t2; +# +# End of 10.5 tests +# +# # MDEV-24353: Adding GROUP BY slows down a query # CREATE TABLE t1 (p int NOT NULL, a int NOT NULL, PRIMARY KEY (p,a)); diff --git a/mysql-test/main/group_min_max.test b/mysql-test/main/group_min_max.test index cf9952e817d..0fa91e4d72b 100644 --- a/mysql-test/main/group_min_max.test +++ b/mysql-test/main/group_min_max.test @@ -1726,6 +1726,23 @@ SELECT DISTINCT owner_id FROM t1 WHERE foo = true GROUP BY owner_id HAVING (COUN DROP TABLE t1; --echo # +--echo # MDEV-30240 Wrong result upon aggregate function with SQL_BUFFER_RESULT +--echo # + +drop table if exists t1,t2; +CREATE TABLE t1 (pk INT PRIMARY KEY); +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (a INT); +INSERT INTO t2 VALUES (1),(2); +SELECT SQL_BUFFER_RESULT MIN(pk) FROM t1, t2; +SELECT MIN(pk) FROM t1, t2; +DROP TABLE t1, t2; + +--echo # +--echo # End of 10.5 tests +--echo # + +--echo # --echo # MDEV-24353: Adding GROUP BY slows down a query --echo # diff --git a/mysql-test/main/range_aria_dbt3.result b/mysql-test/main/range_aria_dbt3.result new file mode 100644 index 00000000000..ae5a2e1329f --- /dev/null +++ b/mysql-test/main/range_aria_dbt3.result @@ -0,0 +1,13 @@ +set default_storage_engine=Aria; +CREATE DATABASE dbt3_s001; +use dbt3_s001; +# +# MDEV-30325 Wrong result upon range query using index condition +# +SELECT COUNT(*) FROM lineitem force index (i_l_orderkey_quantity,i_l_shipdate) WHERE l_shipdate < '1994-01-01' AND l_orderkey < 800 OR l_quantity > 3 AND l_orderkey NOT IN ( 157, 1444 ); +COUNT(*) +5056 +# +# End of 10.5 tests +# +DROP DATABASE dbt3_s001; diff --git a/mysql-test/main/range_aria_dbt3.test b/mysql-test/main/range_aria_dbt3.test new file mode 100644 index 00000000000..89328280987 --- /dev/null +++ b/mysql-test/main/range_aria_dbt3.test @@ -0,0 +1,24 @@ +# +# This is generic tests using dbt3_s001 tables +# This file uses the Aria storage engine +# + +set default_storage_engine=Aria; + +CREATE DATABASE dbt3_s001; +use dbt3_s001; +--disable_query_log +--source include/dbt3_s001.inc +--enable_query_log + +--echo # +--echo # MDEV-30325 Wrong result upon range query using index condition +--echo # + +SELECT COUNT(*) FROM lineitem force index (i_l_orderkey_quantity,i_l_shipdate) WHERE l_shipdate < '1994-01-01' AND l_orderkey < 800 OR l_quantity > 3 AND l_orderkey NOT IN ( 157, 1444 ); + +--echo # +--echo # End of 10.5 tests +--echo # + +DROP DATABASE dbt3_s001; |