MDEV-31933: Make working view-protocol + ps-protocol (running two protocols together)

Fix for v. 10.6

mysql-test/main/cset_narrowing.test

@@ -93,10 +93,13 @@ explain
 select * from t10, t1 where t10.mb4=t1.mb3 and t10.pk=3;
 
 --source include/explain-no-costs.inc
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select
   json_detailed(json_extract(trace, '$**.range_scan_alternatives')) as JS
 from
   information_schema.optimizer_trace;
+--enable_view_protocol
 
 select * from t10, t1 where t10.mb4=t1.mb3 and t10.pk=3;
 
@@ -130,12 +133,15 @@ select * from t10, t2 where t2.mb4>t10.mb4 and t10.pk=3;
 --echo # - ref acccess lookup keys do use equality substitution,
 --echo # - concat() arguments don't
 --source include/explain-no-costs.inc
+#Enable after fix MDEV-32034
+--disable_view_protocol
 explain format=json
 select straight_join * from t10,t1 force index(mb3),t2
 where
   t1.mb3=t2.mb4 and t2.mb4=t10.mb4 and concat(t1.mb3, t2.mb4, t10.mb4)<>'Bebebe';
 select json_detailed(json_extract(trace, '$**.condition_processing')) as JS
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 select straight_join * from t10,t1 force index(mb3),t2
 where
@@ -150,8 +156,11 @@ where
   t1.mb3=t2.mb4 and t2.mb4=t10.mb4 and t10.mb4='hello' and
   concat(t1.mb3, t2.mb4, t10.mb4)<>'Bebebe';
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select json_detailed(json_extract(trace, '$**.condition_processing')) as JS
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 drop table t2;
 drop table t1, t10;

mysql-test/main/ps_missed_cmds_bin_prot.test

@@ -49,7 +49,9 @@ CREATE DATABASE mdev_16708_db;
 USE mdev_16708_db;
 
 --echo # Check that the current database has been changed
+--disable_service_connection
 SELECT DATABASE();
+--enable_service_connection
 
 --echo # Clean up
 USE test;
@@ -84,6 +86,7 @@ DROP TABLE t1;
 --echo # Set up environmentr for the test case
 CREATE TABLE t1 (a INT);
 
+--disable_view_protocol
 BEGIN;
 
 INSERT INTO t1 VALUES (1);
@@ -101,6 +104,7 @@ ROLLBACK TO SAVEPOINT s1;
 SELECT * FROM t1;
 
 RELEASE SAVEPOINT s1;
+--enable_view_protocol
 
 --echo # Clean up
 DROP TABLE t1;