summaryrefslogtreecommitdiff
path: root/mysql-test/main
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2023-02-09 20:45:04 -0800
committerIgor Babaev <igor@askmonty.org>2023-03-15 17:35:22 -0700
commitc912fd3b2945899680c142123652e737c581ba14 (patch)
treeb0b72989e45385fcef9b51a30d0fdcf6dade2ffd /mysql-test/main
parent554278e24dbc2c0af9fcfd66c54ca6a99a3cf17f (diff)
downloadmariadb-git-c912fd3b2945899680c142123652e737c581ba14.tar.gz
Fixes of MDEV-30538 and MDEV-30586 for 10.4 adjusted for 11.0.
The commits for MDEV-30538 and MDEV-30586 could not be cherry-picked into 11.0 separately.
Diffstat (limited to 'mysql-test/main')
-rw-r--r--mysql-test/main/delete.result6
-rw-r--r--mysql-test/main/multi_update.result3
-rw-r--r--mysql-test/main/multi_update.test2
3 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/main/delete.result b/mysql-test/main/delete.result
index d67c84d8ea2..dd62e09b632 100644
--- a/mysql-test/main/delete.result
+++ b/mysql-test/main/delete.result
@@ -583,7 +583,8 @@ explain delete from t1
where exists (select 'X' from t1 a where a.c2 = t1.c2) and c2 >= 3;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 ALL NULL NULL NULL NULL 8 Using where
-2 DEPENDENT SUBQUERY a ALL NULL NULL NULL NULL 8 Using where
+1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1
+2 MATERIALIZED a ALL NULL NULL NULL NULL 8
delete from t1
where exists (select 'X' from t1 a where a.c2 = t1.c2) and c2 >= 3;
select *from t1;
@@ -599,7 +600,8 @@ where exists (select 'X' from t1 a where a.c2 = t1.c2) and c2 >= 3
order by c2;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 ALL NULL NULL NULL NULL 8 Using where
-2 DEPENDENT SUBQUERY a ALL NULL NULL NULL NULL 8 Using where
+1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1
+2 MATERIALIZED a ALL NULL NULL NULL NULL 8
delete from t1
where exists (select 'X' from t1 a where a.c2 = t1.c2) and c2 >= 3
order by c2;
diff --git a/mysql-test/main/multi_update.result b/mysql-test/main/multi_update.result
index 06e0d1442a4..e5ed031c6fb 100644
--- a/mysql-test/main/multi_update.result
+++ b/mysql-test/main/multi_update.result
@@ -1269,8 +1269,7 @@ EXPLAIN
DROP TABLES t1, t2;
# End of 10.3 tests
#
-# MDEV-28538: multi-table UPDATE/DELETE with possible exists-to-in
-#
+# MDEV-30538: multi-table UPDATE/DELETE with possible exists-to-in
create table t1 (c1 int, c2 int, c3 int, index idx(c2));
insert into t1 values
(1,1,1),(3,2,2),(1,3,3),
diff --git a/mysql-test/main/multi_update.test b/mysql-test/main/multi_update.test
index 9f42765b18c..325f63f696f 100644
--- a/mysql-test/main/multi_update.test
+++ b/mysql-test/main/multi_update.test
@@ -1135,7 +1135,7 @@ DROP TABLES t1, t2;
--echo # End of 10.3 tests
--echo #
---echo # MDEV-28538: multi-table UPDATE/DELETE with possible exists-to-in
+--echo # MDEV-30538: multi-table UPDATE/DELETE with possible exists-to-in
--echo #
create table t1 (c1 int, c2 int, c3 int, index idx(c2));