Merge 10.7 into 10.8

MariaDB · Jan 4, 2022 · b0d632a · b0d632a
2 parents daf4fa5 + ce663ad
commit b0d632a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test
@@ -47,13 +47,16 @@ 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 ;
 
 --echo # Non-Mergeable view
 --optimizer_trace
 explain select * from v1 ;
+--enable_ps_protocol
 drop table t1,t2;
 drop view v1,v2;