summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-01-04 15:54:19 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-01-04 15:54:19 +0200
commitce663ad4e4bf71d85cb4cd5b04b0b915881c80f2 (patch)
treed17a428b03a31cfb92a9bd1b473e3c65e52b0727
parent7dfaded9625e832fade4ef1678bcb21c445dad2b (diff)
parentcd751f0259ad20009eb874b13fcae9746f805c93 (diff)
downloadmariadb-git-ce663ad4e4bf71d85cb4cd5b04b0b915881c80f2.tar.gz
Merge 10.6 into 10.7
-rw-r--r--mysql-test/main/opt_trace.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test
index 2077422fa1b..b689c80db1e 100644
--- a/mysql-test/main/opt_trace.test
+++ b/mysql-test/main/opt_trace.test
@@ -47,6 +47,8 @@ ANALYZE TABLE t2;
create view v1 as select a from t1 group by b;
create view v2 as select a from t2;
+# MDEV-27421 ./mtr --ps-protocol main.opt_trace fails to produce some traces
+--disable_ps_protocol
--echo # Mergeable view
--optimizer_trace
explain select * from v2 ;
@@ -54,6 +56,7 @@ explain select * from v2 ;
--echo # Non-Mergeable view
--optimizer_trace
explain select * from v1 ;
+--enable_ps_protocol
drop table t1,t2;
drop view v1,v2;