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>
2025-08-08 11:22:35 +03:00 · 2025-04-01 17:38:25 +11:00
parent b02ad4a6f8
commit 59962ae2b3
53 changed files with 225 additions and 0 deletions
--- 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
--- 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;

--- 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
--- 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

--- 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
--- 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

--- 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;
--- 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

--- 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
--- 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
--- 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;
--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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;
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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)
--- 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)
--- 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;
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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
--- 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)
--- 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)
--- 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)
--- 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;
--- 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)
--- 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