diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-01 17:40:27 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-01 17:40:27 +0200 |
commit | d96433ad2088526ada21dc2e29336254ad64e825 (patch) | |
tree | 0b17faacbf965926a72bbca4fc1ea5817548f876 | |
parent | fd5a6d0f75f1435e6b15409516ccba54b8fee145 (diff) | |
parent | a1965b80e1ba7811a52fe54fc62a74879551598e (diff) | |
download | mariadb-git-d96433ad2088526ada21dc2e29336254ad64e825.tar.gz |
Merge 10.5 into 10.6
-rw-r--r-- | mysql-test/main/group_min_max.result | 5 | ||||
-rw-r--r-- | mysql-test/main/group_min_max.test | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/main/group_min_max.result b/mysql-test/main/group_min_max.result index df942513f3a..356bb4b41df 100644 --- a/mysql-test/main/group_min_max.result +++ b/mysql-test/main/group_min_max.result @@ -4057,9 +4057,10 @@ KEY `index_t1_on_owner_id_and_foo` (`owner_id`,`foo`) INSERT INTO t1 (owner_id, foo, whatever) VALUES (1, TRUE, "yello"), (1, FALSE, "yello"), (2, TRUE, "yello"), (2, TRUE, "yello"), (2, FALSE, "yello"); -EXPLAIN SELECT DISTINCT owner_id FROM t1 WHERE foo = true GROUP BY owner_id HAVING (COUNT(*) = 1); +EXPLAIN +SELECT DISTINCT owner_id FROM t1 WHERE foo = true GROUP BY owner_id HAVING (COUNT(*) = 1); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL index_t1_on_owner_id_and_foo 7 NULL 5 Using where; Using index +1 SIMPLE t1 index NULL index_t1_on_owner_id_and_foo 7 NULL # Using where; Using index SELECT DISTINCT owner_id FROM t1 WHERE foo = true GROUP BY owner_id HAVING (COUNT(*) = 1); owner_id 1 diff --git a/mysql-test/main/group_min_max.test b/mysql-test/main/group_min_max.test index daa407121cf..ed65745a509 100644 --- a/mysql-test/main/group_min_max.test +++ b/mysql-test/main/group_min_max.test @@ -1718,7 +1718,9 @@ CREATE TABLE `t1` ( INSERT INTO t1 (owner_id, foo, whatever) VALUES (1, TRUE, "yello"), (1, FALSE, "yello"), (2, TRUE, "yello"), (2, TRUE, "yello"), (2, FALSE, "yello"); -EXPLAIN SELECT DISTINCT owner_id FROM t1 WHERE foo = true GROUP BY owner_id HAVING (COUNT(*) = 1); +--replace_column 9 # +EXPLAIN +SELECT DISTINCT owner_id FROM t1 WHERE foo = true GROUP BY owner_id HAVING (COUNT(*) = 1); SELECT DISTINCT owner_id FROM t1 WHERE foo = true GROUP BY owner_id HAVING (COUNT(*) = 1); DROP TABLE t1; |