6 files changed, 28 insertions, 2 deletions
diff --git a/mysql-test/main/ctype_utf8mb4_uca.test b/mysql-test/main/ctype_utf8mb4_uca.test
index 6d0036b4507..9ef001fd378 100644
--- a/mysql-test/main/ctype_utf8mb4_uca.test
+++ b/mysql-test/main/ctype_utf8mb4_uca.test
@@ -128,6 +128,9 @@ SET @charset=(SELECT @@character_set_client);
 --echo # SET NAMES CHARACTER SET cs [COLLATE cl]
 --echo #
 
+#enable after fix MDEV-29554
+--disable_view_protocol
+
 CREATE VIEW vars AS
 SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE variable_name IN
 ('character_set_client','character_set_connection','character_set_results',
@@ -175,6 +178,8 @@ SELECT * FROM vars;
 
 DROP VIEW vars;
 
+--enable_view_protocol
+
 --echo #
 --echo # MDEV-27009 Add UCA-14.0.0 collations
 --echo # ALTER TABLE t1 CONVERT TO CHARACTER SET cs [COLLATE cl]
diff --git a/mysql-test/main/func_des_encrypt.test b/mysql-test/main/func_des_encrypt.test
index afc6fb28a26..884fad54635 100644
--- a/mysql-test/main/func_des_encrypt.test
+++ b/mysql-test/main/func_des_encrypt.test
@@ -1,4 +1,6 @@
 -- source include/have_des.inc
+#double warning for view protocol 
+--source include/no_view_protocol.inc
 
 # This test can't be in func_encrypt.test, because it requires
 # --des-key-file to not be set.
diff --git a/mysql-test/main/func_encrypt.test b/mysql-test/main/func_encrypt.test
index 5271efcfcaa..306939ef2ac 100644
--- a/mysql-test/main/func_encrypt.test
+++ b/mysql-test/main/func_encrypt.test
@@ -1,4 +1,6 @@
 -- source include/have_des.inc
+#double warning for view protocol 
+--source include/no_view_protocol.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/main/func_encrypt_ucs2.test b/mysql-test/main/func_encrypt_ucs2.test
index 6c1306955aa..dc4fd309c07 100644
--- a/mysql-test/main/func_encrypt_ucs2.test
+++ b/mysql-test/main/func_encrypt_ucs2.test
@@ -1,5 +1,7 @@
 -- source include/have_des.inc
 -- source include/have_ucs2.inc
+#double warning for view protocol 
+--source include/no_view_protocol.inc
 
 --echo #
 --echo # Bug#59648 my_strtoll10_mb2: Assertion `(*endptr - s) % 2 == 0' failed.
diff --git a/mysql-test/main/func_str.test b/mysql-test/main/func_str.test
index 4e3659f0a21..1c8839f24a2 100644
--- a/mysql-test/main/func_str.test
+++ b/mysql-test/main/func_str.test
@@ -2346,6 +2346,8 @@ SELECT random_bytes(1025);
 SELECT random_bytes(11111);
 SELECT random_bytes(2056);
 
+#double warning for view protocol 
+--disable_view_protocol
 SELECT length(random_bytes(10.0));
 SELECT length(random_bytes(10.1));
 SELECT length(random_bytes(+1e1));
@@ -2356,6 +2358,7 @@ SELECT length(random_bytes("+1e1"));
 SELECT length(random_bytes("10.0bunnies"));
 SELECT length(random_bytes("10.1chickens"));
 SELECT length(random_bytes("+1e1rabbits"));
+--enable_view_protocol
 
 --delimiter |
 create procedure p1()
@@ -2372,10 +2375,13 @@ drop procedure p1;
 --echo #
 --echo # Test For invalid argument return NULL
 --echo #
+#double warning for view protocol 
+--disable_view_protocol
 SELECT random_bytes('s');
 SELECT random_bytes('r');
 SELECT random_bytes('res');
 SELECT random_bytes('test');
+--enable_view_protocol
 
 --echo #
 --echo # MDEV-29108 RANDOM_BYTES - assertion in Create_tmp_table::finalize
@@ -2391,16 +2397,20 @@ DROP TABLE t;
 --echo #
 --echo # MDEV-29154 Excessive warnings upon a call to RANDOM_BYTES
 --echo #
-
+#double warning for view protocol 
+--disable_view_protocol
 select length(random_bytes(cast('x' as unsigned)+1));
 select repeat('.', cast('x' as unsigned)+1);
+--enable_view_protocol
 
 --echo #
 --echo # MDEV-23149 Server crashes in my_convert / ErrConvString::ptr / Item_char_typecast::check_truncation_with_warn
 --echo #
+#double warning for view protocol 
+--disable_view_protocol
 --replace_regex /'.*'/'...random bytes...'/
 select "a" in ("abc", (convert(random_bytes(8) ,binary(2))));
-
+--enable_view_protocol
 --echo #
 --echo # End of 10.10 tests
 --echo #
diff --git a/mysql-test/main/greedy_optimizer.test b/mysql-test/main/greedy_optimizer.test
index 1e5b3e0a9b7..2a830c70677 100644
--- a/mysql-test/main/greedy_optimizer.test
+++ b/mysql-test/main/greedy_optimizer.test
@@ -391,6 +391,9 @@ set join_cache_level=@save_join_cache_level;
 --echo # Bug #59326: Greedy optimizer produce stupid query execution plans.
 --echo #
 
+#double warning for view protocol 
+--disable_view_protocol
+
 CREATE TABLE t10(
   K INT NOT NULL AUTO_INCREMENT,
   I INT,
@@ -952,4 +955,6 @@ INSERT INTO t3 VALUES (5),(6);
 SELECT * FROM t1 WHERE 5 IN (SELECT t1_a.a FROM t1 as t1_a WHERE 1 IN (SELECT t1_b.a FROM t1 as t1_b LEFT JOIN (t2 JOIN t3) ON (t1_b.a = t2.d) WHERE t1_b.b < 1));
 drop table t1,t2,t3;
 
+--enable_view_protocol
+
 --echo End of 10.0 tests