From 59962ae2b3061dbd3694e005c779d9b2dfbf625c Mon Sep 17 00:00:00 2001
From: Yuchen Pei <ycp@mariadb.com>
Date: Tue, 1 Apr 2025 17:38:25 +1100
Subject: [PATCH] MDEV-36442 MDEV-35452 Fix --view-protocol for spider tests
 with SELECT arguments of SELECT statements

Running mtr --view-protocol transforms SELECT statements to a CREATE
OR REPLACE VIEW of the statement, followed by SELECT from the view.
When thus when spider tests check the query log for select statements,
it often output a different one with --view-protocol compared to
without.

By adding disable/enable_view_protocol pairs to these statements. Most
of these statements are surrounded by existing
disable/enable_ps[2]_protocol pairs.

Acked-by: Yuchen Pei <ycp@mariadb.com>
---
 .../t/checksum_table_with_quick_mode_3.test       |  2 ++
 .../mysql-test/spider/bugfix/t/cp932_column.test  |  2 ++
 .../spider/bugfix/t/delete_with_float_column.inc  |  2 ++
 .../spider/bugfix/t/group_by_order_by_limit.test  |  4 ++++
 .../mysql-test/spider/bugfix/t/insert_select.test |  2 ++
 .../mysql-test/spider/bugfix/t/mdev_19866.test    |  4 ++++
 .../mysql-test/spider/bugfix/t/mdev_20100.test    |  2 ++
 .../mysql-test/spider/bugfix/t/mdev_20502.test    |  2 ++
 .../mysql-test/spider/bugfix/t/mdev_21884.test    |  2 ++
 .../mysql-test/spider/bugfix/t/mdev_27172.test    |  2 ++
 .../mysql-test/spider/bugfix/t/mdev_29008.test    |  2 ++
 .../mysql-test/spider/bugfix/t/quick_mode_0.test  | 12 ++++++++++++
 .../mysql-test/spider/bugfix/t/quick_mode_1.test  | 12 ++++++++++++
 .../mysql-test/spider/bugfix/t/quick_mode_2.test  | 12 ++++++++++++
 .../mysql-test/spider/bugfix/t/quick_mode_3.test  | 12 ++++++++++++
 .../spider/bugfix/t/return_found_rows_insert.test |  6 ++++++
 .../spider/bugfix/t/return_found_rows_update.test |  2 ++
 .../spider/bugfix/t/select_by_null.test           |  2 ++
 .../spider/bugfix/t/select_with_backquote.test    |  2 ++
 .../spider/bugfix/t/slave_trx_isolation.test      |  2 ++
 .../mysql-test/spider/bugfix/t/sql_mode.inc       |  2 ++
 .../spider/bugfix/t/strict_group_by.test          |  4 ++++
 .../spider/bugfix/t/wrapper_mariadb.test          |  2 ++
 .../spider/mysql-test/spider/bugfix/t/xa_cmd.test |  2 ++
 .../spider/feature/t/checksum_table_parallel.inc  |  2 ++
 .../e1121/t/direct_join_by_pkey_key.test          |  2 ++
 .../e1121/t/direct_join_by_pkey_pkey.test         |  2 ++
 .../spider/regression/e1121/t/load_data.inc       |  2 ++
 .../e112122/t/group_by_order_by_limit_ok.test     |  4 ++++
 .../regression/e112122/t/load_data_part.inc       |  4 ++++
 .../mysql-test/spider/t/auto_increment.test       |  2 ++
 .../t/checksum_table_with_quick_mode_3.test       |  2 ++
 .../spider/mysql-test/spider/t/direct_join.test   |  4 ++++
 .../mysql-test/spider/t/direct_join_using.test    |  2 ++
 .../mysql-test/spider/t/direct_left_join.test     |  2 ++
 .../spider/t/direct_left_join_nullable.test       |  2 ++
 .../spider/t/direct_left_right_join_nullable.test |  2 ++
 .../t/direct_left_right_left_join_nullable.test   |  2 ++
 .../mysql-test/spider/t/direct_right_join.test    |  2 ++
 .../spider/t/direct_right_join_nullable.test      |  2 ++
 .../spider/t/direct_right_left_join_nullable.test |  2 ++
 .../t/direct_right_left_right_join_nullable.test  |  2 ++
 .../mysql-test/spider/t/partition_cond_push.test  |  6 ++++++
 .../mysql-test/spider/t/partition_fulltext.test   |  6 ++++++
 ...tition_join_pushdown_for_single_partition.test |  6 ++++++
 .../mysql-test/spider/t/pushdown_not_like.test    |  2 ++
 .../spider/mysql-test/spider/t/quick_mode_0.test  | 10 ++++++++++
 .../spider/mysql-test/spider/t/quick_mode_1.test  | 12 ++++++++++++
 .../spider/mysql-test/spider/t/quick_mode_2.test  | 12 ++++++++++++
 .../spider/mysql-test/spider/t/quick_mode_3.test  | 12 ++++++++++++
 .../mysql-test/spider/t/slave_trx_isolation.test  |  2 ++
 storage/spider/mysql-test/spider/t/timestamp.test | 15 +++++++++++++++
 .../spider/mysql-test/spider/t/udf_pushdown.inc   |  2 ++
 53 files changed, 225 insertions(+)

diff --git a/storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.test b/storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.test
index de2dd90a500..e650ef3bd3a 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/checksum_table_with_quick_mode_3.test
@@ -52,9 +52,11 @@ TRUNCATE TABLE mysql.general_log;
 CHECKSUM TABLE tbl_a EXTENDED;
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/bugfix/t/cp932_column.test b/storage/spider/mysql-test/spider/bugfix/t/cp932_column.test
index 119179702ec..a0f70bd9e82 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/cp932_column.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/cp932_column.test
@@ -59,9 +59,11 @@ SET NAMES utf8;
 
 --connection child2_1
 SET NAMES cp932;
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 SET NAMES utf8;
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column.inc b/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column.inc
index a4def9b3dc8..6285cf5eae4 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column.inc
+++ b/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column.inc
@@ -78,9 +78,11 @@ sync_with_master;
 SET SESSION sql_log_bin= 0;
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection slave1_1
diff --git a/storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.test b/storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.test
index d694230bf2a..553fb6adeaf 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/group_by_order_by_limit.test
@@ -76,11 +76,15 @@ SHOW STATUS LIKE 'Spider_direct_aggregate';
 set spider_direct_aggregate=@old_spider_direct_aggregate;
 
 --connection child2_1
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/insert_select.test b/storage/spider/mysql-test/spider/bugfix/t/insert_select.test
index c2ac615e2ac..84ebd230849 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/insert_select.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/insert_select.test
@@ -79,9 +79,11 @@ INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FRO
 INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FROM tbl_a WHERE skey = 5 AND dt > DATE_ADD('2012-12-01', INTERVAL -10 DAY));
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_19866.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_19866.test
index 0b8ce69cd73..a953a250449 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_19866.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_19866.test
@@ -71,11 +71,15 @@ SELECT * FROM tbl_a WHERE pkey = 2;
 SELECT * FROM tbl_a;
 
 --connection child2_1
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_20100.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_20100.test
index 3d1ccf3ce6a..a440b370077 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_20100.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_20100.test
@@ -70,7 +70,9 @@ SELECT a, b, c FROM tbl_a PARTITION (pt2,pt3);
 
 --connection child2_1
 --disable_ps2_protocol
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 --enable_ps2_protocol
 --disable_ps_protocol
 eval $CHILD2_1_SELECT_TABLES;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_20502.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_20502.test
index 1cd1c689372..3174ace8bfb 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_20502.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_20502.test
@@ -59,7 +59,9 @@ SELECT MAX(id) AS m, 0 AS const, val, (SELECT tbl_a.val+1 FROM tbl_a LIMIT 1) AS
 FROM tbl_a GROUP BY val;
 
 --connection child2_1
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test
index c1a9aaa4e9d..01a2a1a1171 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test
@@ -81,9 +81,11 @@ SELECT STRAIGHT_JOIN b.a, b.b FROM tb_l a, tbl_a b WHERE a.a = b.a;
 
 --connection child2_1
 SET NAMES utf8;
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 --disable_ps_protocol
 eval $CHILD2_1_SELECT_TABLES;
 --enable_ps_protocol
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test
index 0b2e065702d..8374713651a 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test
@@ -76,7 +76,9 @@ SELECT * FROM tbl_c WHERE greeting = "Aloha!"
   AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one"; # hack to disable GBH
 
 --connection child2_1
+--disable_view_protocol
 SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %';
+--enable_view_protocol
 --enable_ps2_protocol
 
 --connection child2_1
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_29008.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_29008.test
index f36855d8e71..40455916596 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29008.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29008.test
@@ -38,9 +38,11 @@ SELECT MIN(t2.a) AS f1, t1.b AS f2 FROM tbl_a AS t1 JOIN tbl_a AS t2 GROUP BY f2
 --connection master_1
 DROP DATABASE IF EXISTS auto_test_local;
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %';
 --enable_ps2_protocol
+--enable_view_protocol
 set global log_output=@old_log_output;
 set global general_log=@old_general_log;
 DROP DATABASE IF EXISTS auto_test_remote;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.test b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.test
index 3fd9e623887..23bfcb065db 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_0.test
@@ -78,13 +78,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -103,13 +107,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -129,12 +137,16 @@ SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
+--disable_view_protocol
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.test b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.test
index 940fa61c598..dd56ca135f0 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_1.test
@@ -78,13 +78,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -103,13 +107,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -128,13 +136,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.test b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.test
index e9270a2ee93..cedc4b60449 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_2.test
@@ -78,13 +78,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -103,13 +107,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -128,13 +136,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.test b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.test
index ad042aadfed..db3a6118743 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/quick_mode_3.test
@@ -79,13 +79,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -104,13 +108,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --connection master_1
@@ -129,13 +137,17 @@ TRUNCATE TABLE mysql.general_log;
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.test b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.test
index d4c0db1e7cc..2921d74b1cc 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_insert.test
@@ -56,9 +56,11 @@ exec $MYSQL -v -v -u root -h localhost -P $MASTER_1_MYPORT -S $MASTER_1_MYSOCK -
 --enable_query_log
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 TRUNCATE TABLE mysql.general_log;
@@ -69,9 +71,11 @@ exec $MYSQL -v -v -u root -h localhost -P $MASTER_1_MYPORT -S $MASTER_1_MYSOCK -
 --enable_query_log
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 TRUNCATE TABLE mysql.general_log;
@@ -82,9 +86,11 @@ exec $MYSQL -v -v -u root -h localhost -P $MASTER_1_MYPORT -S $MASTER_1_MYSOCK -
 --enable_query_log
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test
index a5f63978a22..64aa4d7593e 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test
@@ -58,9 +58,11 @@ exec $MYSQL -v -v -u root -h localhost --default-character-set=latin1 -P $MASTER
 --enable_query_log
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/bugfix/t/select_by_null.test b/storage/spider/mysql-test/spider/bugfix/t/select_by_null.test
index feb7df57f02..dfe8b9ec2ef 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/select_by_null.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/select_by_null.test
@@ -52,9 +52,11 @@ TRUNCATE TABLE mysql.general_log;
 SELECT pkey FROM tbl_a WHERE NULL;
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.test b/storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.test
index b511b05bf01..53daaf06f68 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/select_with_backquote.test
@@ -55,7 +55,9 @@ SELECT `pkey`, LEFT(`txt_utf8`, 4) FROM `auto_test_local`.`tbl_a` ORDER BY LEFT(
 
 --connection child2_1
 SET NAMES utf8;
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.test b/storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.test
index 3d4280e35e4..66e044a5a5c 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.test
@@ -71,10 +71,12 @@ SET SESSION sql_log_bin= 0;
 
 --connection child2_1
 
+--disable_view_protocol
 --disable_ps2_protocol
 --replace_regex /-[0-9a-f]{12}-[0-9a-f]+-/-xxxxxxxxxxxx-xxxxx-/
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection slave1_1
diff --git a/storage/spider/mysql-test/spider/bugfix/t/sql_mode.inc b/storage/spider/mysql-test/spider/bugfix/t/sql_mode.inc
index c4b17f6a837..1b3a46590b0 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/sql_mode.inc
+++ b/storage/spider/mysql-test/spider/bugfix/t/sql_mode.inc
@@ -49,8 +49,10 @@ TRUNCATE TABLE mysql.general_log;
 SELECT * FROM tbl_a ORDER BY pkey;
 
 --connection child2_1
+--disable_view_protocol
 --replace_regex /-[0-9a-f]{12}-[0-9a-f]+-/-xxxxxxxxxxxx-xxxxx-/
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/strict_group_by.test b/storage/spider/mysql-test/spider/bugfix/t/strict_group_by.test
index eaf149fa5da..bc9ee2a6833 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/strict_group_by.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/strict_group_by.test
@@ -78,15 +78,19 @@ SHOW STATUS LIKE 'Spider_direct_aggregate';
 set spider_direct_aggregate=@old_spider_direct_aggregate;
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_2_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test b/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test
index d32af31674a..ae7e6643e3b 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test
@@ -50,9 +50,11 @@ TRUNCATE TABLE mysql.general_log;
 SELECT * FROM tbl_a ORDER BY pkey;
 
 --connection child2_1
+--disable_view_protocol
 # in --ps a query is logged differently in a general log
 replace_regex /order by t0.`pkey`/order by `pkey`/;
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/xa_cmd.test b/storage/spider/mysql-test/spider/bugfix/t/xa_cmd.test
index 1e831453e41..690fe3e5b50 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/xa_cmd.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/xa_cmd.test
@@ -49,9 +49,11 @@ XA PREPARE 'test';
 XA COMMIT 'test';
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel.inc b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel.inc
index 83c3ffd6c54..79792b2cacf 100644
--- a/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel.inc
+++ b/storage/spider/mysql-test/spider/feature/t/checksum_table_parallel.inc
@@ -74,10 +74,12 @@ send_eval $MASTER_1_CHECKSUM_TABLE;
 
 --connection child2_1_2
 SELECT SLEEP(1);
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 
 --connection child2_2_2
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 
 --connection child2_1
 UNLOCK TABLES;
diff --git a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test
index ec4639ed666..fd61b986cb1 100644
--- a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test
+++ b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test
@@ -67,7 +67,9 @@ SELECT a.val, a.akey FROM tbl_a a, tbl_b b WHERE a.akey = b.akey AND b.bkey = 5;
 
 --connection child2_1
 --disable_ps_protocol
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 --enable_ps_protocol
 
diff --git a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test
index 52d9b52ddb5..cc272be51b5 100644
--- a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test
+++ b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test
@@ -67,7 +67,9 @@ SELECT a.val, a.akey FROM tbl_a a, tbl_b b WHERE a.akey = b.akey AND b.bkey = 5;
 
 --connection child2_1
 --disable_ps_protocol
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 --enable_ps_protocol
 
diff --git a/storage/spider/mysql-test/spider/regression/e1121/t/load_data.inc b/storage/spider/mysql-test/spider/regression/e1121/t/load_data.inc
index 325a7523974..55fff558338 100644
--- a/storage/spider/mysql-test/spider/regression/e1121/t/load_data.inc
+++ b/storage/spider/mysql-test/spider/regression/e1121/t/load_data.inc
@@ -67,9 +67,11 @@ eval LOAD DATA $OPTION_LOCAL INFILE '$MYSQLTEST_VARDIR/tmp/spider_outfile.tsv' $
 --remove_file $MYSQLTEST_VARDIR/tmp/spider_outfile.tsv
 
 --connection child2_1
+--disable_view_protocol
 --disable_ps2_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
 --enable_ps2_protocol
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --echo
diff --git a/storage/spider/mysql-test/spider/regression/e112122/t/group_by_order_by_limit_ok.test b/storage/spider/mysql-test/spider/regression/e112122/t/group_by_order_by_limit_ok.test
index e4f3f2155bb..dae5a812888 100644
--- a/storage/spider/mysql-test/spider/regression/e112122/t/group_by_order_by_limit_ok.test
+++ b/storage/spider/mysql-test/spider/regression/e112122/t/group_by_order_by_limit_ok.test
@@ -76,11 +76,15 @@ SHOW STATUS LIKE 'Spider_direct_aggregate';
 set spider_direct_aggregate=@old_spider_direct_aggregate;
 
 --connection child2_1
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/regression/e112122/t/load_data_part.inc b/storage/spider/mysql-test/spider/regression/e112122/t/load_data_part.inc
index f52d415a032..7b30cc0865d 100644
--- a/storage/spider/mysql-test/spider/regression/e112122/t/load_data_part.inc
+++ b/storage/spider/mysql-test/spider/regression/e112122/t/load_data_part.inc
@@ -84,11 +84,15 @@ eval LOAD DATA $OPTION_LOCAL INFILE '$MYSQLTEST_VARDIR/tmp/spider_outfile.tsv' $
 
 --disable_ps2_protocol
 --connection child2_1
+--disable_view_protocol
 eval $CHILD2_1_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_1_SELECT_TABLES;
 
 --connection child2_2
+--disable_view_protocol
 eval $CHILD2_2_SELECT_ARGUMENT1;
+--enable_view_protocol
 eval $CHILD2_2_SELECT_TABLES;
 --enable_ps2_protocol
 
diff --git a/storage/spider/mysql-test/spider/t/auto_increment.test b/storage/spider/mysql-test/spider/t/auto_increment.test
index c5f272f5c44..5e3fff3dc55 100644
--- a/storage/spider/mysql-test/spider/t/auto_increment.test
+++ b/storage/spider/mysql-test/spider/t/auto_increment.test
@@ -156,7 +156,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/checksum_table_with_quick_mode_3.test b/storage/spider/mysql-test/spider/t/checksum_table_with_quick_mode_3.test
index e0fa7a84674..44d2878cd08 100644
--- a/storage/spider/mysql-test/spider/t/checksum_table_with_quick_mode_3.test
+++ b/storage/spider/mysql-test/spider/t/checksum_table_with_quick_mode_3.test
@@ -96,9 +96,11 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --disable_ps2_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
     --enable_ps2_protocol
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_join.test b/storage/spider/mysql-test/spider/t/direct_join.test
index 634b958f9f9..23cfbb197c9 100644
--- a/storage/spider/mysql-test/spider/t/direct_join.test
+++ b/storage/spider/mysql-test/spider/t/direct_join.test
@@ -168,7 +168,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -315,7 +317,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_CONST_TABLE_JOIN;
   eval $CHILD2_1_SELECT_CONST_TABLE2_JOIN;
diff --git a/storage/spider/mysql-test/spider/t/direct_join_using.test b/storage/spider/mysql-test/spider/t/direct_join_using.test
index 3ecfb292c89..61942b1998e 100644
--- a/storage/spider/mysql-test/spider/t/direct_join_using.test
+++ b/storage/spider/mysql-test/spider/t/direct_join_using.test
@@ -168,7 +168,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_left_join.test b/storage/spider/mysql-test/spider/t/direct_left_join.test
index c9784b047ed..31744aa199d 100644
--- a/storage/spider/mysql-test/spider/t/direct_left_join.test
+++ b/storage/spider/mysql-test/spider/t/direct_left_join.test
@@ -168,7 +168,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_left_join_nullable.test b/storage/spider/mysql-test/spider/t/direct_left_join_nullable.test
index 7c69d73d335..949a1ecf5c7 100644
--- a/storage/spider/mysql-test/spider/t/direct_left_join_nullable.test
+++ b/storage/spider/mysql-test/spider/t/direct_left_join_nullable.test
@@ -183,7 +183,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_left_right_join_nullable.test b/storage/spider/mysql-test/spider/t/direct_left_right_join_nullable.test
index dd407482713..e81dbbcccad 100644
--- a/storage/spider/mysql-test/spider/t/direct_left_right_join_nullable.test
+++ b/storage/spider/mysql-test/spider/t/direct_left_right_join_nullable.test
@@ -183,7 +183,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_left_right_left_join_nullable.test b/storage/spider/mysql-test/spider/t/direct_left_right_left_join_nullable.test
index 3de0c310464..480ac8dcd1c 100644
--- a/storage/spider/mysql-test/spider/t/direct_left_right_left_join_nullable.test
+++ b/storage/spider/mysql-test/spider/t/direct_left_right_left_join_nullable.test
@@ -183,7 +183,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_right_join.test b/storage/spider/mysql-test/spider/t/direct_right_join.test
index d124f75a230..823d5176f34 100644
--- a/storage/spider/mysql-test/spider/t/direct_right_join.test
+++ b/storage/spider/mysql-test/spider/t/direct_right_join.test
@@ -168,7 +168,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_right_join_nullable.test b/storage/spider/mysql-test/spider/t/direct_right_join_nullable.test
index cdb2d4e6e58..0f0f614a03a 100644
--- a/storage/spider/mysql-test/spider/t/direct_right_join_nullable.test
+++ b/storage/spider/mysql-test/spider/t/direct_right_join_nullable.test
@@ -183,7 +183,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_right_left_join_nullable.test b/storage/spider/mysql-test/spider/t/direct_right_left_join_nullable.test
index cff40bfdeef..75e1551bcbb 100644
--- a/storage/spider/mysql-test/spider/t/direct_right_left_join_nullable.test
+++ b/storage/spider/mysql-test/spider/t/direct_right_left_join_nullable.test
@@ -183,7 +183,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/direct_right_left_right_join_nullable.test b/storage/spider/mysql-test/spider/t/direct_right_left_right_join_nullable.test
index cd677a4bb8d..017a8174df7 100644
--- a/storage/spider/mysql-test/spider/t/direct_right_left_right_join_nullable.test
+++ b/storage/spider/mysql-test/spider/t/direct_right_left_right_join_nullable.test
@@ -183,7 +183,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/partition_cond_push.test b/storage/spider/mysql-test/spider/t/partition_cond_push.test
index e47209ef220..b5eceead130 100644
--- a/storage/spider/mysql-test/spider/t/partition_cond_push.test
+++ b/storage/spider/mysql-test/spider/t/partition_cond_push.test
@@ -166,19 +166,25 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   --connection child2_3
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_3_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_3_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/partition_fulltext.test b/storage/spider/mysql-test/spider/t/partition_fulltext.test
index 1b31fa05534..664617d2451 100644
--- a/storage/spider/mysql-test/spider/t/partition_fulltext.test
+++ b/storage/spider/mysql-test/spider/t/partition_fulltext.test
@@ -170,19 +170,25 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   --connection child2_3
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_3_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_3_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/partition_join_pushdown_for_single_partition.test b/storage/spider/mysql-test/spider/t/partition_join_pushdown_for_single_partition.test
index 753014d5da7..e1916e1d9b0 100644
--- a/storage/spider/mysql-test/spider/t/partition_join_pushdown_for_single_partition.test
+++ b/storage/spider/mysql-test/spider/t/partition_join_pushdown_for_single_partition.test
@@ -169,19 +169,25 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   --connection child2_3
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_3_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_3_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/pushdown_not_like.test b/storage/spider/mysql-test/spider/t/pushdown_not_like.test
index b39bb7785f6..5e7de1ff0ed 100644
--- a/storage/spider/mysql-test/spider/t/pushdown_not_like.test
+++ b/storage/spider/mysql-test/spider/t/pushdown_not_like.test
@@ -111,7 +111,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     SELECT argument FROM mysql.general_log WHERE argument LIKE '%select%';
+    --enable_view_protocol
   }
 }
 --enable_ps2_protocol
diff --git a/storage/spider/mysql-test/spider/t/quick_mode_0.test b/storage/spider/mysql-test/spider/t/quick_mode_0.test
index 070d9e40548..b7f923ac609 100644
--- a/storage/spider/mysql-test/spider/t/quick_mode_0.test
+++ b/storage/spider/mysql-test/spider/t/quick_mode_0.test
@@ -135,15 +135,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -195,15 +199,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -243,6 +251,7 @@ if ($USE_CHILD_GROUP2)
   }
 }
 --connection master_1
+--disable_view_protocol
 --disable_ps2_protocol
 SELECT a.pkey FROM tbl_a a, tbl_b b WHERE a.pkey = b.pkey;
 if ($USE_CHILD_GROUP2)
@@ -273,6 +282,7 @@ if ($USE_CHILD_GROUP2)
   }
 }
 --enable_ps2_protocol
+--enable_view_protocol
 
 --echo
 --echo deinit
diff --git a/storage/spider/mysql-test/spider/t/quick_mode_1.test b/storage/spider/mysql-test/spider/t/quick_mode_1.test
index a2c2bf87844..979679249bc 100644
--- a/storage/spider/mysql-test/spider/t/quick_mode_1.test
+++ b/storage/spider/mysql-test/spider/t/quick_mode_1.test
@@ -135,15 +135,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -195,15 +199,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -255,15 +263,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/quick_mode_2.test b/storage/spider/mysql-test/spider/t/quick_mode_2.test
index 12a48a904a2..2db2d1415bf 100644
--- a/storage/spider/mysql-test/spider/t/quick_mode_2.test
+++ b/storage/spider/mysql-test/spider/t/quick_mode_2.test
@@ -135,15 +135,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -195,15 +199,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -255,15 +263,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/quick_mode_3.test b/storage/spider/mysql-test/spider/t/quick_mode_3.test
index 65851a5bf3e..bb9bc8c6e48 100644
--- a/storage/spider/mysql-test/spider/t/quick_mode_3.test
+++ b/storage/spider/mysql-test/spider/t/quick_mode_3.test
@@ -135,15 +135,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -195,15 +199,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -255,15 +263,19 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
     eval $CHILD2_2_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/slave_trx_isolation.test b/storage/spider/mysql-test/spider/t/slave_trx_isolation.test
index a3a3fad8677..b88d038de46 100644
--- a/storage/spider/mysql-test/spider/t/slave_trx_isolation.test
+++ b/storage/spider/mysql-test/spider/t/slave_trx_isolation.test
@@ -109,8 +109,10 @@ if ($USE_CHILD_GROUP2)
   --disable_ps2_protocol
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     --replace_regex /-[0-9a-f]{12}-[0-9a-f]+-/-xxxxxxxxxxxx-xxxxx-/
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   --enable_ps2_protocol
   eval $CHILD2_1_SELECT_TABLES;
diff --git a/storage/spider/mysql-test/spider/t/timestamp.test b/storage/spider/mysql-test/spider/t/timestamp.test
index 47d637bb0c5..fddfbfd3880 100644
--- a/storage/spider/mysql-test/spider/t/timestamp.test
+++ b/storage/spider/mysql-test/spider/t/timestamp.test
@@ -183,7 +183,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLE;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -216,6 +218,7 @@ if ($USE_CHILD_GROUP2)
 }
 --connection master_1
 DELETE FROM tbl_a WHERE col_ts='1970-01-01 01:00:01';
+--disable_view_protocol
 --disable_ps2_protocol
 SELECT *, unix_timestamp(col_ts) FROM tbl_a;
 if ($USE_CHILD_GROUP2)
@@ -228,7 +231,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLE;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -272,7 +277,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLE;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -317,7 +324,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLE;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -367,7 +376,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLE;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -447,7 +458,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLE;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -499,7 +512,9 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
+    --disable_view_protocol
     eval $CHILD2_1_SELECT_ARGUMENT1;
+    --enable_view_protocol
   }
   eval $CHILD2_1_SELECT_TABLE_F;
   if (!$OUTPUT_CHILD_GROUP2)
diff --git a/storage/spider/mysql-test/spider/t/udf_pushdown.inc b/storage/spider/mysql-test/spider/t/udf_pushdown.inc
index df9742a35b8..93e570a656d 100644
--- a/storage/spider/mysql-test/spider/t/udf_pushdown.inc
+++ b/storage/spider/mysql-test/spider/t/udf_pushdown.inc
@@ -9,7 +9,9 @@ SELECT * FROM ta_l WHERE id IN (plusone(1), plusone(2)) AND a = plusone(32);
 if ($USE_CHILD_GROUP2)
 {
   --connection child2_1
+  --disable_view_protocol
   SELECT argument FROM mysql.general_log WHERE argument LIKE "%select%" AND argument NOT LIKE "%argument%";
+  --enable_view_protocol
   --disable_query_log
   TRUNCATE TABLE mysql.general_log;
   --enable_query_log