MDEV-27691: make working view-protocol

Update tests for version 10.4

1 files changed, 29 insertions, 5 deletions

diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test
index 855ce11aaf5..0785d828a07 100644
--- a/mysql-test/main/opt_trace.test
+++ b/mysql-test/main/opt_trace.test
@@ -21,6 +21,7 @@ create view v2 as select * from t1 where t1.a=1 group by t1.b;
 set optimizer_trace="enabled=on";
 
 --echo # Mergeable views/derived tables
+--disable_view_protocol
 select * from v1;
 select * from information_schema.OPTIMIZER_TRACE;
 select * from (select * from t1 where t1.a=1)q;
@@ -29,7 +30,7 @@ select * from information_schema.OPTIMIZER_TRACE;
 --echo # Non-Mergeable views
 select * from v2;
 select * from information_schema.OPTIMIZER_TRACE;
-
+--enable_view_protocol
 drop table t1,t2;
 drop view v1,v2;
 drop function f1;
@@ -271,6 +272,7 @@ begin
 end|
 
 delimiter ;|
+--disable_view_protocol
 set optimizer_trace='enabled=on';
 select f1(a) from t1;
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
@@ -280,11 +282,12 @@ drop table t1,t2;
 drop function f1;
 drop function f2;
 set optimizer_trace='enabled=off';
+--enable_view_protocol
 
 --echo #
 --echo # MDEV-18489: Limit the memory used by the optimizer trace
 --echo #
-
+--disable_view_protocol
 create table t1 (a int);
 insert into t1 values (1),(2);
 
@@ -303,7 +306,7 @@ select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 drop table t1;
 set optimizer_trace='enabled=off';
 set @@optimizer_trace_max_mem_size= @save_optimizer_trace_max_mem_size;
-
+--enable_view_protocol
 --echo #
 --echo # MDEV-18527: Optimizer trace for DELETE query shows table:null
 --echo #
@@ -400,6 +403,8 @@ create table t1 ( a int, b int, key a_b(a,b));
 insert into t1 select a,a from one_k;
 set optimizer_trace='enabled=on';
 
+#enable after fix MDEV-27871
+--disable_view_protocol
 explain select * from t1 force index (a_b) where a=2 and b=4;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 
@@ -498,6 +503,7 @@ insert into t1 select date_add(now(), interval a day), date_add(now(), interval
 explain format=json select * from t1 force index(start_date) where start_date >= '2019-02-10' and end_date <'2019-04-01';
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 drop table t1, t0, one_k;
+--enable_view_protocol
 
 --echo #
 --echo # MDEV-19776: Assertion `to_len >= 8' failed in convert_to_printable with optimizer trace enabled
@@ -527,6 +533,8 @@ set optimizer_trace=1;
 --echo #  (cost_for_plan is the same as best_access_path.cost for single-table SELECTs
 --echo #   but for joins using condition selectivity it is not as trivial. So,
 --echo #   now we are printing it)
+#enable after fix MDEV-27871
+--disable_view_protocol
 explain select * from t0 A, one_k B where A.a<5 and B.a<800;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 
@@ -536,6 +544,7 @@ set join_cache_level=@tmp_jcl;
 explain select * from t0 A, one_k B where A.a=B.b and B.a<800;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 drop table t0, one_k;
+--enable_view_protocol
 
 --echo #
 --echo # Assertion `to_len >= 8' failed in convert_to_printable
@@ -546,8 +555,10 @@ insert into t1 values ('foo'), ('bar');
 
 EXPLAIN SELECT * FROM t1 WHERE a= REPEAT('a', 0);
 SELECT * FROM t1 WHERE a= REPEAT('a', 0);
+#enable after fix MDEV-27871
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
-
+--enable_view_protocol
 DROP TABLE t1;
 
 --echo #
@@ -577,7 +588,10 @@ create table t1 (kp1 int, kp2 int, key(kp1, kp2));
 insert into t1 values (1,1),(1,5),(5,1),(5,5);
 set optimizer_trace=1;
 select * from t1 force index(kp1) where (kp1=2 and kp2 >=4);
+#enable after fix MDEV-27871
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.range_scan_alternatives')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 
 --echo #
@@ -589,10 +603,13 @@ INSERT INTO t1 SELECT seq, seq from seq_1_to_10;
 CREATE TABLE t2(a INT, b INT, key(a));
 INSERT INTO t2 SELECT seq, seq from seq_1_to_100;
 
+#enable after fix MDEV-27871
+--disable_view_protocol
 SET OPTIMIZER_TRACE=1;
 EXPLAIN SELECT * FROM t1, t2 WHERE t1.a=t2.a ORDER BY t2.b;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 DROP TABLE t1,t2;
+--enable_view_protocol
 
 --echo #
 --echo # MDEV-22665: Print ranges in the optimizer trace created for non-indexed columns when
@@ -603,12 +620,15 @@ CREATE TABLE t1(a INT, b INT);
 INSERT INTO t1 SELECT seq, seq from seq_1_to_100;
 SET optimizer_trace=1;
 ANALYZE TABLE t1 PERSISTENT FOR ALL;
+#enable after fix MDEV-27871
+--disable_view_protocol
 EXPLAIN EXTENDED SELECT * from t1 WHERE a between 1 and 5 and b <= 5;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 EXPLAIN EXTENDED SELECT * from t1 WHERE a != 5;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 EXPLAIN EXTENDED SELECT * from t1 WHERE b >= 10 and b < 25;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 
 --echo #
@@ -619,7 +639,10 @@ drop table t1;
 CREATE TABLE t1( a INT, b INT, PRIMARY KEY( a ) );
 SELECT sum(b), row_number() OVER (order by b) FROM t1 WHERE a = 101;
 UPDATE t1 SET b=10 WHERE a=1;
+#enable after fix MDEV-27871
+--disable_view_protocol
 SELECT JSON_DETAILED(JSON_EXTRACT(trace, '$**.range_scan_alternatives')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 DROP TABLE t1;
 
 set optimizer_trace='enabled=off';
@@ -637,11 +660,12 @@ set max_session_mem_used=default;
 --echo #
 --echo # MDEV-22380 Assertion `name.length == strlen(name.str)' failed in Item::print_item_w_name on SELECT w/ optimizer_trace enabled
 --echo #
-
+--disable_view_protocol
 SET optimizer_trace="enabled=on";
 SELECT 'a\0' LIMIT 0;
 SELECT query, trace FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 SET optimizer_trace=DEFAULT;
+--enable_view_protocol
 
 --echo #
 --echo # MDEV-27238: Assertion `got_name == named_item_expected()' failed in Json_writer::on_start_object