diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 7f1021abb29..d8908771cfc 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -9516,6 +9516,7 @@ int util_query(MYSQL* org_mysql, const char* query){
       /* enable local infile, in non-binary builds often disabled by default */
       mysql_options(mysql, MYSQL_OPT_LOCAL_INFILE, 0);
       mysql_options(mysql, MYSQL_OPT_NONBLOCK, 0);
+      mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&(org_mysql->options.protocol));
       SET_SSL_OPTS(mysql);
       safe_connect(mysql, "util", org_mysql->host, org_mysql->user,
           org_mysql->passwd, org_mysql->db, org_mysql->port,
@@ -9637,7 +9638,7 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
   dynstr_set(&ds_res, 0);
 
   if (view_protocol_enabled && mysql &&
-      complete_query &&
+      complete_query && !(mysql->server_status & SERVER_STATUS_IN_TRANS) &&
       match_re(&view_re, query))
   {
     /*
diff --git a/mysql-test/include/common-tests.inc b/mysql-test/include/common-tests.inc
index 890309be5e0..1cc4ae23446 100644
--- a/mysql-test/include/common-tests.inc
+++ b/mysql-test/include/common-tests.inc
@@ -1737,17 +1737,21 @@ select t2.companynr,companyname,count(*) from t2,t4 where t2.companynr=t4.compan
 select count(*) from t2;
 select count(*) from t2 where fld1 < 098024;
 # PS does correct pre-zero here. MySQL can't do it as it returns a number.
+--disable_view_protocol
 --disable_ps_protocol
 select min(fld1) from t2 where fld1>= 098024;
 --enable_ps_protocol
+--enable_view_protocol
 select max(fld1) from t2 where fld1>= 098024;
 select count(*) from t3 where price2=76234234;
 select count(*) from t3 where companynr=512 and price2=76234234;
 explain select min(fld1),max(fld1),count(*) from t2;
 # PS does correct pre-zero here. MySQL can't do it as it returns a number.
+--disable_view_protocol
 --disable_ps_protocol
 select min(fld1),max(fld1),count(*) from t2;
 --enable_ps_protocol
+--enable_view_protocol
 select min(t2nr),max(t2nr) from t3 where t2nr=2115 and price2=823742;
 select count(*),min(t2nr),max(t2nr) from t3 where name='spates' and companynr=78;
 select t2nr,count(*) from t3 where name='gems' group by t2nr limit 20;
diff --git a/mysql-test/main/backup_stages.test b/mysql-test/main/backup_stages.test
index 22793db8f02..d1d30e2b04c 100644
--- a/mysql-test/main/backup_stages.test
+++ b/mysql-test/main/backup_stages.test
@@ -6,6 +6,7 @@
 # A transactional engine
 --source include/have_innodb.inc
 --source include/have_metadata_lock_info.inc
+--source include/no_view_protocol.inc
 # As non transactional engine we have MyISAM anyway.
 
 let $old_lock_wait_timeout = `SELECT @@global.lock_wait_timeout`;
diff --git a/mysql-test/main/create_drop_user.result b/mysql-test/main/create_drop_user.result
index 16653196e37..4a72a4b0891 100644
--- a/mysql-test/main/create_drop_user.result
+++ b/mysql-test/main/create_drop_user.result
@@ -61,7 +61,7 @@ DROP USER u1, u2, u3;
 Warnings:
 Note	4227	Dropped users 'u1'@'%','u3'@'%' have active connections. Use KILL CONNECTION if they should not be used anymore.
 # None of the users u1, u2, u3 should be present in the system
-SELECT user, host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
+SELECT User, Host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
 User	Host
 disconnect con1;
 disconnect con3;
@@ -86,7 +86,7 @@ DROP USER u1, u2, u3;
 ERROR HY000: Operation DROP USER failed for 'u1'@'%','u3'@'%'
 # It is expected to see two users in output of the query: u1 and u3,
 # u2 should be dropped since it doesn't have active connection at the moment
-SELECT user, host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
+SELECT User, Host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
 User	Host
 u1	%
 u3	%
diff --git a/mysql-test/main/create_drop_user.test b/mysql-test/main/create_drop_user.test
index 635eacb43d8..eeefa63c1b4 100644
--- a/mysql-test/main/create_drop_user.test
+++ b/mysql-test/main/create_drop_user.test
@@ -68,7 +68,7 @@ GRANT ALL on test.* to u3;
 DROP USER u1, u2, u3;
 
 --echo # None of the users u1, u2, u3 should be present in the system
-SELECT user, host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
+SELECT User, Host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
 
 --disconnect con1
 --disconnect con3
@@ -98,7 +98,7 @@ DROP USER u1, u2, u3;
 
 --echo # It is expected to see two users in output of the query: u1 and u3,
 --echo # u2 should be dropped since it doesn't have active connection at the moment
-SELECT user, host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
+SELECT User, Host FROM mysql.user WHERE user IN ('u1', 'u2', 'u3');
 SET sql_mode= @save_sql_mode;
 
 --disconnect con1
diff --git a/mysql-test/main/deadlock_ftwrl.test b/mysql-test/main/deadlock_ftwrl.test
index 5c7d2bbab6e..1114a16e41f 100644
--- a/mysql-test/main/deadlock_ftwrl.test
+++ b/mysql-test/main/deadlock_ftwrl.test
@@ -3,6 +3,7 @@
 # Deadlock detector should resolve conflicts between FTWRL and user locks.
 
 --source include/have_debug_sync.inc
+--source include/no_view_protocol.inc
 
 CREATE TABLE t1(a INT);
 SELECT GET_LOCK("l1", 0);
diff --git a/mysql-test/main/derived.test b/mysql-test/main/derived.test
index a1ec4d1a632..5a06f74e1bf 100644
--- a/mysql-test/main/derived.test
+++ b/mysql-test/main/derived.test
@@ -1194,6 +1194,7 @@ drop table t1,t2,t3;
 --echo # query includes a derived table containing unnamed column
 --echo # (eg: `SELECT '' from t`).
 --echo #
+--disable_view_protocol
 
 --echo # Tests from the bug report
 
@@ -1292,6 +1293,7 @@ SELECT * FROM v6_t;
 
 DROP VIEW v1_t, v2_t, v3_t, v4_t, v5_t, v6_t;
 DROP TABLE t;
+--enable_view_protocol
 
 --echo # End of 10.11 tests
 
diff --git a/mysql-test/main/flush_block_commit.test b/mysql-test/main/flush_block_commit.test
index 9161ebb90f9..a54cb67d53a 100644
--- a/mysql-test/main/flush_block_commit.test
+++ b/mysql-test/main/flush_block_commit.test
@@ -4,6 +4,7 @@
 # This is intended to mimick how mysqldump and innobackup work.
 
 # And it requires InnoDB
+--source include/no_view_protocol.inc
 --source include/have_innodb.inc
 
 connect (con1,localhost,root,,);
diff --git a/mysql-test/main/flush_read_lock.result b/mysql-test/main/flush_read_lock.result
index a8f8431e125..8f5d3927480 100644
--- a/mysql-test/main/flush_read_lock.result
+++ b/mysql-test/main/flush_read_lock.result
@@ -50,19 +50,6 @@ set local sql_mode="";
 # check that DDL statements on temporary tables
 # are compatible with FTRWL. 
 call mtr.add_suppression("BINLOG_BASE64_EVENT: Error executing row event.*error code: 1223");
-drop tables if exists t1_base, t2_base, t3_trans;
-drop tables if exists tm_base, tm_base_temp;
-drop database if exists mysqltest1;
-# We're going to test ALTER DATABASE UPGRADE
-drop database if exists `#mysql50#mysqltest-2`;
-drop procedure if exists p1;
-drop function if exists f1;
-drop view if exists v1;
-drop procedure if exists p2;
-drop function if exists f2_base;
-drop function if exists f2_temp;
-drop event if exists e1;
-drop event if exists e2;
 create table t1_base(i int) engine=myisam;
 create table t2_base(j int) engine=myisam;
 create table t3_trans(i int) engine=innodb;
diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test
index 8708d75ac0a..619780df0dc 100644
--- a/mysql-test/main/flush_read_lock.test
+++ b/mysql-test/main/flush_read_lock.test
@@ -10,6 +10,7 @@
 # Parts of this test use DDL on events, BINLOG statement and
 # other statements which are not supported in embedded server.
 --source include/not_embedded.inc
+--source include/no_view_protocol.inc
 
 set global sql_mode="";
 set local sql_mode="";
@@ -66,21 +67,6 @@ set local sql_mode="";
 
 call mtr.add_suppression("BINLOG_BASE64_EVENT: Error executing row event.*error code: 1223");
 
---disable_warnings
-drop tables if exists t1_base, t2_base, t3_trans;
-drop tables if exists tm_base, tm_base_temp;
-drop database if exists mysqltest1;
---echo # We're going to test ALTER DATABASE UPGRADE
-drop database if exists `#mysql50#mysqltest-2`;
-drop procedure if exists p1;
-drop function if exists f1;
-drop view if exists v1;
-drop procedure if exists p2;
-drop function if exists f2_base;
-drop function if exists f2_temp;
-drop event if exists e1;
-drop event if exists e2;
---enable_warnings
 create table t1_base(i int) engine=myisam;
 create table t2_base(j int) engine=myisam;
 create table t3_trans(i int) engine=innodb;
diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result
index f392cd8fe25..801e0e57f6c 100644
--- a/mysql-test/main/grant.result
+++ b/mysql-test/main/grant.result
@@ -854,7 +854,7 @@ create user mysqltest_8;
 ERROR HY000: Operation CREATE USER failed for 'mysqltest_8'@'%'
 create user mysqltest_8@host8;
 ERROR HY000: Operation CREATE USER failed for 'mysqltest_8'@'host8'
-select user, QUOTE(host) from mysql.user where user="mysqltest_8";
+select User, QUOTE(host) from mysql.user where user="mysqltest_8";
 User	QUOTE(host)
 mysqltest_8	'%'
 mysqltest_8	'host8'
@@ -1948,7 +1948,7 @@ DROP DATABASE db2;
 #
 grant usage on Foo.* to myuser@Localhost identified by 'foo';
 grant select on Foo.* to myuser@localhost;
-select host,user from mysql.user where User='myuser';
+select Host,User from mysql.user where User='myuser';
 Host	User
 localhost	myuser
 revoke select on Foo.* from myuser@localhost;
diff --git a/mysql-test/main/grant.test b/mysql-test/main/grant.test
index 8bcf68f4ef2..17f45fb38ba 100644
--- a/mysql-test/main/grant.test
+++ b/mysql-test/main/grant.test
@@ -2,6 +2,7 @@
 
 # Grant tests not performed with embedded server
 --source include/not_embedded.inc
+--disable_service_connection
 
 set GLOBAL sql_mode="";
 set LOCAL sql_mode="";
@@ -589,7 +590,7 @@ create user mysqltest_8;
 --error ER_CANNOT_USER
 create user mysqltest_8@host8;
 
-select user, QUOTE(host) from mysql.user where user="mysqltest_8";
+select User, QUOTE(host) from mysql.user where user="mysqltest_8";
 
 --echo Schema privileges
 grant select on mysqltest.* to mysqltest_8@'';
@@ -1765,7 +1766,7 @@ DROP DATABASE db2;
 --echo #
 grant usage on Foo.* to myuser@Localhost identified by 'foo';
 grant select on Foo.* to myuser@localhost;
-select host,user from mysql.user where User='myuser';
+select Host,User from mysql.user where User='myuser';
 revoke select on Foo.* from myuser@localhost;
 delete from mysql.user where User='myuser';
 flush privileges;
diff --git a/mysql-test/main/grant2.result b/mysql-test/main/grant2.result
index 3e40ad8ac79..b1667253e2c 100644
--- a/mysql-test/main/grant2.result
+++ b/mysql-test/main/grant2.result
@@ -174,7 +174,7 @@ grant select on *.* to 'mysqltest_2';
 grant insert on test.* to 'mysqltest_2';
 grant update on test.t1 to 'mysqltest_2';
 grant update (c2) on test.t2 to 'mysqltest_2';
-select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
+select Host,User,Password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
 Host	User	Password	plugin	authentication_string
 %	mysqltest_1		mysql_native_password	
 %	mysqltest_2	*BD447CBA355AF58578D3AE33BA2E2CD388BA08D1	mysql_native_password	*BD447CBA355AF58578D3AE33BA2E2CD388BA08D1
@@ -199,7 +199,7 @@ GRANT INSERT ON "test".* TO "mysqltest_2"@"%"
 GRANT UPDATE ("c2") ON "test"."t2" TO "mysqltest_2"@"%"
 GRANT UPDATE ON "test"."t1" TO "mysqltest_2"@"%"
 drop user 'mysqltest_1';
-select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
+select Host,User,Password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
 Host	User	Password	plugin	authentication_string
 %	mysqltest_2	*BD447CBA355AF58578D3AE33BA2E2CD388BA08D1	mysql_native_password	*BD447CBA355AF58578D3AE33BA2E2CD388BA08D1
 %	mysqltest_3	fffffffffffffffffffffffffffffffffffffffff	mysql_native_password	fffffffffffffffffffffffffffffffffffffffff
@@ -216,7 +216,7 @@ host	db	user	table_name	column_name
 show grants for 'mysqltest_1';
 ERROR 42000: There is no such grant defined for user 'mysqltest_1' on host '%'
 rename user 'mysqltest_2' to 'mysqltest_1';
-select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%' ;
+select Host,User,Password,plugin,authentication_string from mysql.user where user like 'mysqltest_%' ;
 Host	User	Password	plugin	authentication_string
 %	mysqltest_1	*BD447CBA355AF58578D3AE33BA2E2CD388BA08D1	mysql_native_password	*BD447CBA355AF58578D3AE33BA2E2CD388BA08D1
 %	mysqltest_3	fffffffffffffffffffffffffffffffffffffffff	mysql_native_password	fffffffffffffffffffffffffffffffffffffffff
@@ -360,7 +360,7 @@ mysqltest_1@127.0.0.1
 set password = password('changed');
 disconnect b12302;
 connection default;
-select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
+select Host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
 Host	length(authentication_string)
 127.0.0.1	41
 revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.1';
@@ -375,7 +375,7 @@ mysqltest_1@127.0.0.0/255.0.0.0
 set password = password('changed');
 disconnect b12302_2;
 connection default;
-select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
+select Host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
 Host	length(authentication_string)
 127.0.0.0/255.0.0.0	41
 revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.0/255.0.0.0';
diff --git a/mysql-test/main/grant2.test b/mysql-test/main/grant2.test
index 27960189399..123899d3d24 100644
--- a/mysql-test/main/grant2.test
+++ b/mysql-test/main/grant2.test
@@ -217,7 +217,7 @@ grant insert on test.* to 'mysqltest_2';
 grant update on test.t1 to 'mysqltest_2';
 grant update (c2) on test.t2 to 'mysqltest_2';
 --sorted_result
-select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
+select Host,User,Password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
 --sorted_result
 select host,db,user from mysql.db where user like 'mysqltest_%';
 --sorted_result
@@ -230,7 +230,7 @@ show grants for 'mysqltest_2';
 # Drop
 drop user 'mysqltest_1';
 --sorted_result
-select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
+select Host,User,Password,plugin,authentication_string from mysql.user where user like 'mysqltest_%';
 --sorted_result
 select host,db,user from mysql.db where user like 'mysqltest_%';
 --sorted_result
@@ -243,7 +243,7 @@ show grants for 'mysqltest_1';
 # Rename
 rename user 'mysqltest_2' to 'mysqltest_1';
 --sorted_result
-select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%' ;
+select Host,User,Password,plugin,authentication_string from mysql.user where user like 'mysqltest_%' ;
 --sorted_result
 select host,db,user from mysql.db where user like 'mysqltest_%' ;
 --sorted_result
@@ -385,7 +385,7 @@ select current_user();
 set password = password('changed');
 disconnect b12302;
 connection default;
-select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
+select Host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
 revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.1';
 delete from mysql.user where user like 'mysqltest\_1';
 flush privileges;
@@ -396,7 +396,7 @@ select current_user();
 set password = password('changed');
 disconnect b12302_2;
 connection default;
-select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
+select Host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
 revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.0/255.0.0.0';
 delete from mysql.user where user like 'mysqltest\_1';
 flush privileges;
diff --git a/mysql-test/main/grant3.result b/mysql-test/main/grant3.result
index 62a592849fb..24537ab9c15 100644
--- a/mysql-test/main/grant3.result
+++ b/mysql-test/main/grant3.result
@@ -27,7 +27,7 @@ flush privileges;
 grant select on test.* to CUser@localhost;
 grant select on test.* to CUser@LOCALHOST;
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
@@ -35,14 +35,14 @@ user	host	db	select_priv
 CUser	localhost	test	Y
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
 user	host	db	select_priv
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
@@ -54,7 +54,7 @@ create table t1 (a int);
 grant select on test.t1 to CUser@localhost;
 grant select on test.t1 to CUser@LOCALHOST;
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
@@ -62,14 +62,14 @@ user	host	db	Table_name	Table_priv	Column_priv
 CUser	localhost	test	t1	Select	
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 user	host	db	Table_name	Table_priv	Column_priv
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
@@ -80,7 +80,7 @@ ERROR HY000: Operation DROP USER failed for 'CUser'@'localhost'
 grant select(a) on test.t1 to CUser@localhost;
 grant select(a) on test.t1 to CUser@LOCALHOST;
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
@@ -88,14 +88,14 @@ user	host	db	Table_name	Table_priv	Column_priv
 CUser	localhost	test	t1		Select
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 user	host	db	Table_name	Table_priv	Column_priv
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 User	Host
 CUser	localhost
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
@@ -107,7 +107,7 @@ drop table t1;
 grant select on test.* to CUser2@localhost;
 grant select on test.* to CUser2@LOCALHOST;
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser2' order by 1,2;
 User	Host
 CUser2	localhost
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
@@ -115,7 +115,7 @@ user	host	db	select_priv
 CUser2	localhost	test	Y
 REVOKE SELECT ON test.* FROM 'CUser2'@'LOCALHOST';
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser2' order by 1,2;
 User	Host
 CUser2	localhost
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
@@ -123,7 +123,7 @@ user	host	db	select_priv
 REVOKE SELECT ON test.* FROM 'CUser2'@'localhost';
 ERROR 42000: There is no such grant defined for user 'CUser2' on host 'localhost'
 flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser2' order by 1,2;
 User	Host
 CUser2	localhost
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
diff --git a/mysql-test/main/grant3.test b/mysql-test/main/grant3.test
index db55505c7af..31cdc4e240a 100644
--- a/mysql-test/main/grant3.test
+++ b/mysql-test/main/grant3.test
@@ -42,19 +42,19 @@ grant select on test.* to CUser@localhost;
 grant select on test.* to CUser@LOCALHOST;
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
 
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
 
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
 
 DROP USER CUser@localhost;
@@ -67,19 +67,19 @@ grant select on test.t1 to CUser@localhost;
 grant select on test.t1 to CUser@LOCALHOST;
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 
 DROP USER CUser@localhost;
@@ -92,19 +92,19 @@ grant select(a) on test.t1 to CUser@localhost;
 grant select(a) on test.t1 to CUser@LOCALHOST;
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser' order by 1,2;
 SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
 
 DROP USER CUser@localhost;
@@ -119,20 +119,20 @@ grant select on test.* to CUser2@localhost;
 grant select on test.* to CUser2@LOCALHOST;
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser2' order by 1,2;
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
 
 REVOKE SELECT ON test.* FROM 'CUser2'@'LOCALHOST';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser2' order by 1,2;
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
 
 --error ER_NONEXISTING_GRANT
 REVOKE SELECT ON test.* FROM 'CUser2'@'localhost';
 flush privileges;
 
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
+SELECT User, Host FROM mysql.user where user = 'CUser2' order by 1,2;
 SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
 
 DROP USER CUser2@localhost;
diff --git a/mysql-test/main/information_schema_temp_table.test b/mysql-test/main/information_schema_temp_table.test
index ab24491afce..74461016e15 100644
--- a/mysql-test/main/information_schema_temp_table.test
+++ b/mysql-test/main/information_schema_temp_table.test
@@ -6,6 +6,9 @@
 
 --source include/have_innodb.inc
 
+# service connection doesn't follow `use db`
+--disable_service_connection
+
 --echo # -------------------------------
 --echo # Test shadowing of a base table
 --echo # -------------------------------
@@ -83,8 +86,10 @@ create sequence s1;
 create temporary table t1 (b int);
 create temporary sequence s1;
 create temporary sequence s2;
+--disable_view_protocol
 select table_schema, table_name, table_type, temporary from information_schema.tables where table_schema = 'test'
   order by table_schema desc, table_name desc, table_type desc;
+--enable_view_protocol
 
 drop table t1;
 drop table t1;
@@ -210,9 +215,11 @@ CREATE TABLE t1 (a INT) ENGINE=MyISAM;
 insert into t1 values (1);
 CREATE TEMPORARY TABLE t2 (a INT) ENGINE=MERGE UNION=(t1);
 CREATE TABLE t3 (a INT) ENGINE=MERGE UNION=(t1);
+--disable_view_protocol
 --sorted_result
 --replace_column 10 X 11 X 12 X 13 X 15 X 16 X 22 X
 SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test';
+--enable_view_protocol
 DROP TABLE t1,t2,t3;
 
 --echo #
diff --git a/mysql-test/main/init_connect.test b/mysql-test/main/init_connect.test
index 159ba46b6fa..cc144568c44 100644
--- a/mysql-test/main/init_connect.test
+++ b/mysql-test/main/init_connect.test
@@ -7,6 +7,10 @@
 
 --source include/add_anonymous_users.inc
 
+# let's not use service connection here otherwise
+# it'll be constantly reexecuting init-connect
+--disable_service_connection
+
 connect (con0,localhost,root,,);
 connection con0;
 select hex(@a);
@@ -35,11 +39,13 @@ connection con0;
 set GLOBAL init_connect="adsfsdfsdfs";
 connect (con5,localhost,user_1,,test);
 connection con5;
+--disable_view_protocol
 # BUG#11755281/47032: ERROR 2006 / ERROR 2013 INSTEAD OF PROPER ERROR MESSAGE
 # We now throw a proper error message here:
 --replace_regex /connection .* to/connection to/
 --error ER_NEW_ABORTING_CONNECTION
 select @a;
+--enable_view_protocol
 # We got disconnected after receiving the above error message; any further
 # requests should fail with a notice that no one's listening to us.
 # --error CR_SERVER_GONE_ERROR,CR_SERVER_LOST
diff --git a/mysql-test/main/innodb_mysql_sync.result b/mysql-test/main/innodb_mysql_sync.result
index 0b703b1d600..b37cf4ad6de 100644
--- a/mysql-test/main/innodb_mysql_sync.result
+++ b/mysql-test/main/innodb_mysql_sync.result
@@ -29,7 +29,6 @@ SET DEBUG_SYNC='RESET';
 # Bug#47459 Assertion in Diagnostics_area::set_eof_status on
 #           OPTIMIZE TABLE
 #
-DROP TABLE IF EXISTS t1;
 connect  con1, localhost, root;
 connection default;
 CREATE TABLE t1(a INT) ENGINE= InnoDB;
@@ -55,7 +54,6 @@ SET DEBUG_SYNC= "RESET";
 #
 # Bug#53757 assert in mysql_truncate_by_delete
 #
-DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1(a INT) Engine=InnoDB;
 CREATE TABLE t2(id INT);
 INSERT INTO t1 VALUES (1), (2);
@@ -78,7 +76,6 @@ SET DEBUG_SYNC= "RESET";
 # Bug#58933 Assertion `thd- >is_error()' fails on shutdown with ongoing
 #           OPTIMIZE TABLE
 #
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1), (2);
 connect  con1,localhost,root;
@@ -105,8 +102,6 @@ disconnect con1;
 # Bug#42230 during add index, cannot do queries on storage engines
 #           that implement add_index
 #
-DROP DATABASE IF EXISTS db1;
-DROP TABLE IF EXISTS t1;
 connect con1,localhost,root;
 connect con2,localhost,root;
 # Test 1: Secondary index, should not block reads (original test case).
@@ -190,7 +185,6 @@ DROP TABLE t1;
 # Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING SECONDARY INDEX
 #              IN INNODB
 #
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb;
 INSERT INTO t1 VALUES (1, 12345), (2, 23456);
 connect  con1,localhost,root;
@@ -211,8 +205,6 @@ disconnect con1;
 #
 # Bug#13417754 ASSERT IN ROW_DROP_DATABASE_FOR_MYSQL DURING DROP SCHEMA
 #
-DROP TABLE IF EXISTS t1;
-DROP DATABASE IF EXISTS db1;
 CREATE TABLE t1(a int) engine=InnoDB;
 CREATE DATABASE db1;
 connect con1, localhost, root;
@@ -243,7 +235,6 @@ disconnect con2;
 #
 # Multi thread tests.
 # See alter_table.test for single thread tests.
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(a INT PRIMARY KEY, b INT) engine=InnoDB;
 INSERT INTO t1 VALUES (1,1), (2,2);
 SET DEBUG_SYNC= 'RESET';
diff --git a/mysql-test/main/innodb_mysql_sync.test b/mysql-test/main/innodb_mysql_sync.test
index a95e0889eaf..21dc6a31b5a 100644
--- a/mysql-test/main/innodb_mysql_sync.test
+++ b/mysql-test/main/innodb_mysql_sync.test
@@ -5,6 +5,7 @@
 --source include/have_partition.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/no_view_protocol.inc
 
 --echo #
 --echo # Bug 42074 concurrent optimize table and 
@@ -40,10 +41,6 @@ SET DEBUG_SYNC='RESET';
 --echo #           OPTIMIZE TABLE
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 connect (con1, localhost, root);
 connection default;
 
@@ -72,10 +69,6 @@ SET DEBUG_SYNC= "RESET";
 --echo # Bug#53757 assert in mysql_truncate_by_delete
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
---enable_warnings
-
 CREATE TABLE t1(a INT) Engine=InnoDB;
 CREATE TABLE t2(id INT);
 INSERT INTO t1 VALUES (1), (2);
@@ -101,10 +94,6 @@ SET DEBUG_SYNC= "RESET";
 --echo #           OPTIMIZE TABLE
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1), (2);
 
@@ -135,11 +124,6 @@ disconnect con1;
 --echo #           that implement add_index
 --echo #
 
---disable_warnings
-DROP DATABASE IF EXISTS db1;
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 connect(con1,localhost,root);
 connect(con2,localhost,root);
 
@@ -253,10 +237,6 @@ DROP TABLE t1;
 --echo #              IN INNODB
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb;
 INSERT INTO t1 VALUES (1, 12345), (2, 23456);
 
@@ -276,11 +256,6 @@ disconnect con1;
 --echo # Bug#13417754 ASSERT IN ROW_DROP_DATABASE_FOR_MYSQL DURING DROP SCHEMA
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP DATABASE IF EXISTS db1;
---enable_warnings
-
 CREATE TABLE t1(a int) engine=InnoDB;
 CREATE DATABASE db1;
 
@@ -329,10 +304,6 @@ disconnect con2;
 --echo # Multi thread tests.
 --echo # See alter_table.test for single thread tests.
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1(a INT PRIMARY KEY, b INT) engine=InnoDB;
 INSERT INTO t1 VALUES (1,1), (2,2);
 SET DEBUG_SYNC= 'RESET';
diff --git a/mysql-test/main/lock.test b/mysql-test/main/lock.test
index 4ac7c36536a..ccd2a017a38 100644
--- a/mysql-test/main/lock.test
+++ b/mysql-test/main/lock.test
@@ -2,6 +2,7 @@
 # Testing of table locking
 #
 
+--source include/no_view_protocol.inc
 --source include/have_partition.inc
 
 CREATE TABLE t1 (  `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY  (`id`,`id2`), KEY `index_id3` (`id3`)) ENGINE=MyISAM;
diff --git a/mysql-test/main/lock_multi.result b/mysql-test/main/lock_multi.result
index a47b4f7af78..361e1c63bfd 100644
--- a/mysql-test/main/lock_multi.result
+++ b/mysql-test/main/lock_multi.result
@@ -174,9 +174,7 @@ disconnect con2;
 DROP DATABASE mysqltest_1;
 ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist
 connection locker;
-set sql_mode="";
-create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
-set sql_mode=default;
+create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1));
 lock tables t1 write;
 connection writer;
 alter table t1 auto_increment=0;
@@ -287,7 +285,6 @@ disconnect locker;
 disconnect locker2;
 disconnect reader;
 disconnect writer;
-drop table if exists t1;
 create table t1 (i int);
 connect  flush,localhost,root,,test,,;
 connection default;
@@ -313,7 +310,6 @@ i	j
 drop table t1;
 disconnect flush;
 disconnect insert;
-drop table if exists t1;
 create table t1 (i int);
 connect  flush,localhost,root,,test,,;
 connection default;
@@ -327,7 +323,6 @@ connection flush;
 connection default;
 disconnect flush;
 drop table t1;
-drop table if exists t1,t2;
 create table t1 (a int);
 flush status;
 lock tables t1 read;
@@ -344,7 +339,6 @@ select @tlwa < @tlwb;
 @tlwa < @tlwb
 1
 End of 5.1 tests
-drop table if exists t1;
 create table t1 (i int);
 connect  flush,localhost,root,,test,,;
 connection default;
@@ -360,7 +354,6 @@ disconnect flush;
 #
 # Test for bug #46272 "MySQL 5.4.4, new MDL: unnecessary deadlock".
 #
-drop table if exists t1;
 create table t1 (c1 int primary key, c2 int, c3 int);
 insert into t1 values (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0);
 begin;
@@ -388,8 +381,6 @@ drop table t1;
 #
 # Bug#47249 assert in MDL_global_lock::is_lock_type_compatible
 #
-DROP TABLE IF EXISTS t1;
-DROP VIEW  IF EXISTS v1;
 #
 # Test 1: LOCK TABLES v1 WRITE, t1 READ;
 #
@@ -424,8 +415,6 @@ DROP VIEW v1;
 # Test for bug #50913 "Deadlock between open_and_lock_tables_derived
 # and MDL". Also see additional coverage in mdl_sync.test.
 # 
-drop table if exists t1;
-drop view if exists v1;
 connect  con50913,localhost,root;
 connection default;
 create table t1 (i int);
@@ -475,7 +464,6 @@ drop table t1;
 # These tests also provide function coverage for the
 # lock_wait_timeout server variable.
 #
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (id int);
 connect con2, localhost, root,,;
 SET SESSION lock_wait_timeout= 1;
@@ -568,7 +556,6 @@ disconnect con3;
 # Test for bug #51134 "Crash in MDL_lock::destroy on a concurrent
 #                      DDL workload".
 #
-drop tables if exists t1, t2, t3;
 connect  con1, localhost, root, , ;
 connect  con2, localhost, root, , ;
 connection default;
@@ -600,7 +587,6 @@ drop table t3;
 # even if the table to altered was temporary.
 # Bug found while working on the related bug #51240.
 #
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (id INT);
 LOCK TABLE t1 WRITE;
 connect  con1, localhost, root;
diff --git a/mysql-test/main/lock_multi.test b/mysql-test/main/lock_multi.test
index bf63234c49e..3ab3906a108 100644
--- a/mysql-test/main/lock_multi.test
+++ b/mysql-test/main/lock_multi.test
@@ -1,5 +1,7 @@
 # Test to see if select will get the lock ahead of low priority update
 
+--source include/no_view_protocol.inc
+
 --disable_ps2_protocol
 connect (locker,localhost,root,,);
 connect (locker2,localhost,root,,);
@@ -318,11 +320,7 @@ DROP DATABASE mysqltest_1;
 #
 connection locker;
 # Disable warnings to allow test to run also without InnoDB
-set sql_mode="";
---disable_warnings
-create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
---enable_warnings
-set sql_mode=default;
+create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1));
 lock tables t1 write;
 connection writer;
 send
@@ -538,9 +536,6 @@ disconnect writer;
 # Test ALTER TABLE under LOCK TABLES and FLUSH TABLES WITH READ LOCK
 #
 
---disable_warnings
-drop table if exists t1;
---enable_warnings
 create table t1 (i int);
 connect (flush,localhost,root,,test,,);
 connection default;
@@ -594,9 +589,6 @@ disconnect insert;
 # from a impending FLUSH TABLES WITH READ LOCK
 #
 
---disable_warnings
-drop table if exists t1;
---enable_warnings
 create table t1 (i int);
 connect (flush,localhost,root,,test,,);
 connection default;
@@ -624,9 +616,6 @@ drop table t1;
 # Bug#30331 Table_locks_waited shows inaccurate values
 #
 
---disable_warnings
-drop table if exists t1,t2;
---enable_warnings
 create table t1 (a int);
 flush status;
 lock tables t1 read;
@@ -660,9 +649,6 @@ select @tlwa < @tlwb;
 # WITH READ LOCK
 #
 
---disable_warnings
-drop table if exists t1;
---enable_warnings
 create table t1 (i int);
 connect (flush,localhost,root,,test,,);
 connection default;
@@ -689,9 +675,6 @@ disconnect flush;
 --echo #
 --echo # Test for bug #46272 "MySQL 5.4.4, new MDL: unnecessary deadlock".
 --echo #
---disable_warnings
-drop table if exists t1;
---enable_warnings
 create table t1 (c1 int primary key, c2 int, c3 int);
 insert into t1 values (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0);
 begin;
@@ -734,11 +717,6 @@ drop table t1;
 --echo # Bug#47249 assert in MDL_global_lock::is_lock_type_compatible
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP VIEW  IF EXISTS v1;
---enable_warnings
-
 --echo #
 --echo # Test 1: LOCK TABLES v1 WRITE, t1 READ;
 --echo #
@@ -786,10 +764,6 @@ DROP VIEW v1;
 --echo # Test for bug #50913 "Deadlock between open_and_lock_tables_derived
 --echo # and MDL". Also see additional coverage in mdl_sync.test.
 --echo # 
---disable_warnings
-drop table if exists t1;
-drop view if exists v1;
---enable_warnings
 connect (con50913,localhost,root);
 connection default;
 create table t1 (i int);
@@ -860,10 +834,6 @@ drop table t1;
 --echo # lock_wait_timeout server variable.
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1 (id int);
 
 connect(con2, localhost, root,,);
@@ -1002,9 +972,6 @@ disconnect con3;
 --echo # Test for bug #51134 "Crash in MDL_lock::destroy on a concurrent
 --echo #                      DDL workload".
 --echo #
---disable_warnings
-drop tables if exists t1, t2, t3;
---enable_warnings
 connect (con1, localhost, root, , );
 connect (con2, localhost, root, , );
 connection default;
@@ -1053,10 +1020,6 @@ drop table t3;
 --echo # Bug found while working on the related bug #51240.
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1 (id INT);
 LOCK TABLE t1 WRITE;
 
diff --git a/mysql-test/main/mdl_sync.test b/mysql-test/main/mdl_sync.test
index 53da9aa88bf..14947b685b1 100644
--- a/mysql-test/main/mdl_sync.test
+++ b/mysql-test/main/mdl_sync.test
@@ -4,6 +4,7 @@
 --source include/have_debug_sync.inc
 --source include/have_metadata_lock_info.inc
 --source include/have_innodb.inc
+--source include/no_view_protocol.inc
 
 #
 # Test the case of when a exclusive lock request waits for a
diff --git a/mysql-test/main/opt_hints_split_materialized.test b/mysql-test/main/opt_hints_split_materialized.test
index 2b5899968e7..431b95f6936 100644
--- a/mysql-test/main/opt_hints_split_materialized.test
+++ b/mysql-test/main/opt_hints_split_materialized.test
@@ -4,6 +4,7 @@
 
 --source include/have_innodb.inc
 --source include/have_sequence.inc
+--source include/no_view_protocol.inc
 
 set @save_optimizer_switch=@@optimizer_switch;
 
diff --git a/mysql-test/main/opt_trace_security.test b/mysql-test/main/opt_trace_security.test
index f56d2d1120e..9f62f5feb93 100644
--- a/mysql-test/main/opt_trace_security.test
+++ b/mysql-test/main/opt_trace_security.test
@@ -1,4 +1,6 @@
 --source include/not_embedded.inc
+--disable_service_connection
+
 create database db1;
 use db1;
 create table t1(a int);
diff --git a/mysql-test/main/opt_trace_store_ddls.test b/mysql-test/main/opt_trace_store_ddls.test
index a90d6f105b6..fea1eeecb30 100644
--- a/mysql-test/main/opt_trace_store_ddls.test
+++ b/mysql-test/main/opt_trace_store_ddls.test
@@ -1,6 +1,8 @@
 --source include/not_embedded.inc
 --source include/have_sequence.inc
 --source include/have_partition.inc
+--source include/no_view_protocol.inc
+
 set optimizer_record_context=ON;
 --echo #
 show variables like 'optimizer_record_context';
diff --git a/mysql-test/main/query_cache_notembedded.test b/mysql-test/main/query_cache_notembedded.test
index 0a88009d997..3fde8e1d4af 100644
--- a/mysql-test/main/query_cache_notembedded.test
+++ b/mysql-test/main/query_cache_notembedded.test
@@ -1,5 +1,6 @@
 -- source include/have_query_cache.inc
 -- source include/not_embedded.inc
+-- source include/no_view_protocol.inc
 
 #
 # Tests with query cache
diff --git a/mysql-test/main/sp-innodb.test b/mysql-test/main/sp-innodb.test
index eb516698089..a35bdf42a8a 100644
--- a/mysql-test/main/sp-innodb.test
+++ b/mysql-test/main/sp-innodb.test
@@ -1,4 +1,4 @@
-
+--source include/no_view_protocol.inc
 --source include/have_innodb.inc
 
 --echo #
diff --git a/mysql-test/main/sp-security.test b/mysql-test/main/sp-security.test
index d891ad8b91b..3e89c2571ab 100644
--- a/mysql-test/main/sp-security.test
+++ b/mysql-test/main/sp-security.test
@@ -5,6 +5,7 @@
 # Can't test with embedded server that doesn't support grants
 --source include/not_embedded.inc
 --source include/default_charset.inc
+--disable_service_connection
 set @@global.collation_server=@@session.collation_server;
 
 connect (con1root,localhost,root,,);
diff --git a/mysql-test/main/sp-threads.test b/mysql-test/main/sp-threads.test
index 27488f46260..13b370e1d02 100644
--- a/mysql-test/main/sp-threads.test
+++ b/mysql-test/main/sp-threads.test
@@ -1,5 +1,6 @@
 # This test should work in embedded server after mysqltest is fixed
 -- source include/not_embedded.inc
+--disable_service_connection
 #
 # Testing stored procedures with multiple connections,
 # except security/privilege tests, they go to sp-security.test
diff --git a/mysql-test/main/ssl.test b/mysql-test/main/ssl.test
index 785880d1052..3b4a5cb6e7a 100644
--- a/mysql-test/main/ssl.test
+++ b/mysql-test/main/ssl.test
@@ -8,6 +8,7 @@
 
 --source include/default_charset.inc
 --source include/have_perfschema.inc
+--disable_service_connection
 
 connect (ssl_con,localhost,root,,,,,SSL);
 
diff --git a/mysql-test/main/status.test b/mysql-test/main/status.test
index e683bc7287d..a3087d9c9c0 100644
--- a/mysql-test/main/status.test
+++ b/mysql-test/main/status.test
@@ -3,6 +3,7 @@
 
 # embedded server causes different stat
 -- source include/not_embedded.inc
+-- source include/no_view_protocol.inc
 
 # Disable concurrent inserts to avoid sporadic test failures as it might
 # affect the the value of variables used throughout the test case.
diff --git a/mysql-test/main/trigger-trans.result b/mysql-test/main/trigger-trans.result
index 0f381bee886..e0ac4bfa404 100644
--- a/mysql-test/main/trigger-trans.result
+++ b/mysql-test/main/trigger-trans.result
@@ -119,8 +119,9 @@ select get_lock("lock_bug26141_wait", 0);
 get_lock("lock_bug26141_wait", 0)
 1
 connection default;
-select get_lock("lock_bug26141_sync", /* must not be priorly locked */ 0);
-get_lock("lock_bug26141_sync", /* must not be priorly locked */ 0)
+# must not be priorly locked
+select get_lock("lock_bug26141_sync", 0);
+get_lock("lock_bug26141_sync", 0)
 1
 insert into t1 (c) values (2);
 connection connection_update;
diff --git a/mysql-test/main/trigger-trans.test b/mysql-test/main/trigger-trans.test
index d94ca0a42c5..be23e77bd64 100644
--- a/mysql-test/main/trigger-trans.test
+++ b/mysql-test/main/trigger-trans.test
@@ -98,7 +98,8 @@ connection default;
 #
 # Run the trigger synchronously 
 #
-select get_lock("lock_bug26141_sync", /* must not be priorly locked */ 0);
+--echo # must not be priorly locked
+select get_lock("lock_bug26141_sync", 0);
 # Will acquire the table level locks, perform the insert into t2,
 # release the sync lock and block on the wait lock.
 send insert into t1 (c) values (2);
diff --git a/mysql-test/main/user_limits.test b/mysql-test/main/user_limits.test
index 299d5a73ae9..173501a9671 100644
--- a/mysql-test/main/user_limits.test
+++ b/mysql-test/main/user_limits.test
@@ -4,6 +4,7 @@
 
 # Requires privileges to be enabled
 --source include/not_embedded.inc
+--source include/no_view_protocol.inc
 
 set @my_max_user_connections= @@global.max_user_connections;
 
diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test
index 1e6e35612cf..08d7d1eec05 100644
--- a/mysql-test/main/view.test
+++ b/mysql-test/main/view.test
@@ -2,6 +2,7 @@
 --source include/default_optimizer_switch.inc
 --source include/have_innodb.inc
 --source include/test_db_charset_latin1.inc
+--source include/no_view_protocol.inc
 
 SET optimizer_switch='outer_join_with_cache=off';
 
diff --git a/mysql-test/suite/encryption/t/innodb-bad-key-change.test b/mysql-test/suite/encryption/t/innodb-bad-key-change.test
index 3ca97596840..e867261ff51 100644
--- a/mysql-test/suite/encryption/t/innodb-bad-key-change.test
+++ b/mysql-test/suite/encryption/t/innodb-bad-key-change.test
@@ -36,7 +36,9 @@ SELECT * FROM t1;
 INSERT INTO t1 VALUES ('foobar',1);
 INSERT INTO t1 VALUES ('foobar',2);
 FLUSH TABLE WITH READ LOCK;
+--disable_view_protocol
 SELECT * FROM t1;
+--enable_view_protocol
 
 --echo
 --echo # Restart server with keysbad3.txt
diff --git a/mysql-test/suite/engines/funcs/r/rpl_slave_status.result b/mysql-test/suite/engines/funcs/r/rpl_slave_status.result
index 73875665526..d3a8f638af8 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_slave_status.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_slave_status.result
@@ -31,7 +31,7 @@ n
 connection master;
 DROP USER rpl@127.0.0.1;
 Warnings:
-Note	4240	Dropped users 'rpl'@'127.0.0.1' have active connections. Use KILL CONNECTION if they should not be used anymore.
+Note	4227	Dropped users 'rpl'@'127.0.0.1' have active connections. Use KILL CONNECTION if they should not be used anymore.
 FLUSH PRIVILEGES;
 connection slave;
 ==== Restart slave without privileges =====
diff --git a/mysql-test/suite/federated/federatedx_create_handlers.test b/mysql-test/suite/federated/federatedx_create_handlers.test
index e63b57f50a2..a19effc2f1a 100644
--- a/mysql-test/suite/federated/federatedx_create_handlers.test
+++ b/mysql-test/suite/federated/federatedx_create_handlers.test
@@ -3,6 +3,9 @@
 --source include/no_valgrind_without_big.inc
 --source include/have_partition.inc
 
+# FederatedX select handler doesn't support views
+--source include/no_view_protocol.inc
+
 connection default;
 ALTER DATABASE federated CHARACTER SET latin1;
 
diff --git a/mysql-test/suite/innodb/r/innodb_ctype_ldml.result b/mysql-test/suite/innodb/r/innodb_ctype_ldml.result
index 665414929d0..50294958549 100644
--- a/mysql-test/suite/innodb/r/innodb_ctype_ldml.result
+++ b/mysql-test/suite/innodb/r/innodb_ctype_ldml.result
@@ -474,8 +474,8 @@ SET NAMES utf8;
 SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci));
 hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci))
 0E33
-SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci));
-hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci))
+SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci)) AS 'Must be FFFD';
+Must be FFFD
 FFFD
 SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a));
 hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci)	hex(lower(@a))
@@ -951,9 +951,9 @@ HEX(WEIGHT_STRING(a))	HEX(CONVERT(a USING ucs2))	HEX(a)
 15D3	09B809CD	E0A6B8E0A78D
 15D4	09B909CD	E0A6B9E0A78D
 SELECT HEX(WEIGHT_STRING(a)) as wa,
-GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
+GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a) gc
 FROM t1 GROUP BY a ORDER BY a;
-wa	GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
+wa	gc
 15A2	0985
 15A3	0986
 15A4	0987
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index 01fa0d84934..ca0eb06d613 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -1,5 +1,7 @@
 -- source include/have_innodb.inc
 -- source include/have_innodb_16k.inc
+# autocommit=0 everywhere below, so
+-- source include/no_view_protocol.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 
diff --git a/mysql-test/suite/innodb/t/innodb_ctype_ldml.test b/mysql-test/suite/innodb/t/innodb_ctype_ldml.test
index 81b12041169..fc717eb7d47 100644
--- a/mysql-test/suite/innodb/t/innodb_ctype_ldml.test
+++ b/mysql-test/suite/innodb/t/innodb_ctype_ldml.test
@@ -181,10 +181,12 @@ create table t1 (c1 char(1) character set ucs2 collate ucs2_vn_ci);
 show create table t1;
 
 insert into t1 values (0x0061);
+--disable_view_protocol
 --enable_metadata
 set @@character_set_results=NULL;
 select * from t1;
 --disable_metadata
+--enable_view_protocol
 drop table t1;
 
 #
@@ -205,7 +207,7 @@ SET NAMES utf8;
 
 # make sure utf8mb4_test_400_ci is Unicode-4.0.0 based
 SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci));
-SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci));
+SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci)) AS 'Must be FFFD';
 SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a));
 SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a));
 SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a));
@@ -342,7 +344,7 @@ INSERT INTO t1 VALUES
 SELECT HEX(WEIGHT_STRING(a)), HEX(CONVERT(a USING ucs2)), HEX(a)
 FROM t1 ORDER BY a, BINARY(a);
 SELECT HEX(WEIGHT_STRING(a)) as wa,
-GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
+GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a) gc
 FROM t1 GROUP BY a ORDER BY a;
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/multi_source/gtid_ignore_duplicates.test b/mysql-test/suite/multi_source/gtid_ignore_duplicates.test
index 2607bc44a4f..6bc11716681 100644
--- a/mysql-test/suite/multi_source/gtid_ignore_duplicates.test
+++ b/mysql-test/suite/multi_source/gtid_ignore_duplicates.test
@@ -1,6 +1,7 @@
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/no_view_protocol.inc
 
 --disable_query_log
 call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
diff --git a/mysql-test/suite/perfschema/r/no_threads.result b/mysql-test/suite/perfschema/r/no_threads.result
index 21991b15931..5d2b4c56008 100644
--- a/mysql-test/suite/perfschema/r/no_threads.result
+++ b/mysql-test/suite/perfschema/r/no_threads.result
@@ -2,7 +2,6 @@ update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_consumers set enabled='YES';
 update performance_schema.setup_instruments set enabled='YES'
   where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
-drop table if exists test.t1;
 truncate table performance_schema.events_waits_current;
 truncate table performance_schema.events_waits_history;
 truncate table performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
index 100fdffa377..a82baff6ac9 100644
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
@@ -19,6 +19,7 @@ call mtr.add_suppression("santa.claus.ipv6.example.com");
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc
+--disable_service_connection
 
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
index 6f83221c496..fbb1895b083 100644
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
@@ -20,6 +20,7 @@
 
 SET @saved_max_connections=@@global.max_connections;
 SET @saved_max_user_connections=@@global.max_user_connections;
+--disable_service_connection
 
 create user 'quota'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
index 896b9bb4886..043beb9ba0b 100644
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
@@ -19,6 +19,7 @@ call mtr.add_suppression("2001:db8::6:6");
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc
+--disable_service_connection
 
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
diff --git a/mysql-test/suite/perfschema/t/no_threads.test b/mysql-test/suite/perfschema/t/no_threads.test
index b7b8767f1cc..131291196bf 100644
--- a/mysql-test/suite/perfschema/t/no_threads.test
+++ b/mysql-test/suite/perfschema/t/no_threads.test
@@ -2,7 +2,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
-
+--disable_service_connection
 
 # Setup : in this main thread
 
@@ -11,10 +11,6 @@ update performance_schema.setup_consumers set enabled='YES';
 update performance_schema.setup_instruments set enabled='YES'
   where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 
---disable_warnings
-drop table if exists test.t1;
---enable_warnings
-
 truncate table performance_schema.events_waits_current;
 truncate table performance_schema.events_waits_history;
 truncate table performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/t/socket_instances_func.test b/mysql-test/suite/perfschema/t/socket_instances_func.test
index 01ba7228172..ba6e3464fbd 100644
--- a/mysql-test/suite/perfschema/t/socket_instances_func.test
+++ b/mysql-test/suite/perfschema/t/socket_instances_func.test
@@ -38,6 +38,8 @@ if($my_socket_debug)
   --echo IPV6=$check_ipv6_supported, IPV4_MAPPED=$check_ipv4_mapped_supported, LOCALHOST=$my_localhost
 }
 
+--disable_service_connection
+
 # This test only runs when IPv6 is supported (see include/check_ipv6.inc), so
 # the server will listen on both IPv4 and IPv6 wildcard addresses. That's why
 # the expected number of TCP/IP listeners is always 2.
diff --git a/mysql-test/suite/perfschema/t/threads_mysql.test b/mysql-test/suite/perfschema/t/threads_mysql.test
index e0a249e828f..0f5f4e187bb 100644
--- a/mysql-test/suite/perfschema/t/threads_mysql.test
+++ b/mysql-test/suite/perfschema/t/threads_mysql.test
@@ -6,6 +6,7 @@
 --source include/not_windows.inc
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/no_view_protocol.inc
 
 # Ensure that the event scheduler (started via threads_mysql-master.opt)
 # is really running.
diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test
index 3166e1eadd6..b5af6d05910 100644
--- a/mysql-test/suite/plugins/t/server_audit.test
+++ b/mysql-test/suite/plugins/t/server_audit.test
@@ -1,6 +1,7 @@
 --source include/have_plugin_auth.inc
 --source include/not_embedded.inc
 --source include/have_ssl_communication.inc
+--source include/no_view_protocol.inc
 
 if (!$SERVER_AUDIT_SO) {
   skip No SERVER_AUDIT plugin;
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_wait_point.test b/mysql-test/suite/rpl/t/rpl_semi_sync_wait_point.test
index 5eae91a55f2..5ffe1495edc 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_wait_point.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_wait_point.test
@@ -1,5 +1,6 @@
 source include/not_embedded.inc;
 source include/have_innodb.inc;
+source include/no_view_protocol.inc;
 
 #
 # This test the rpl_semi_sync_master_wait_point functionality
diff --git a/mysql-test/suite/sys_vars/inc/autocommit_func2.inc b/mysql-test/suite/sys_vars/inc/autocommit_func2.inc
index 5fff72157b4..15e61185c9c 100644
--- a/mysql-test/suite/sys_vars/inc/autocommit_func2.inc
+++ b/mysql-test/suite/sys_vars/inc/autocommit_func2.inc
@@ -1,3 +1,4 @@
+--source include/no_view_protocol.inc
 --source include/have_innodb.inc
 
 CREATE TABLE t1
diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_threads_basic.result b/mysql-test/suite/sys_vars/r/slave_parallel_threads_basic.result
index 56aa5976f91..76efbf1d16f 100644
--- a/mysql-test/suite/sys_vars/r/slave_parallel_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_parallel_threads_basic.result
@@ -1,6 +1,6 @@
 SET @save_slave_parallel_threads= @@GLOBAL.slave_parallel_threads;
-SELECT IF(COUNT(*) < 20, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) FROM information_schema.processlist WHERE user = "system user";
-IF(COUNT(*) < 20, "OK", CONCAT("Found too many system user processes: ", COUNT(*)))
+SELECT IF(COUNT(*) < 20, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) as 'OK?' FROM information_schema.processlist WHERE user = "system user";
+OK?
 OK
 SELECT @@GLOBAL.slave_parallel_threads as 'must be 20 because of .cnf';
 must be 20 because of .cnf
@@ -16,7 +16,7 @@ SET GLOBAL slave_parallel_threads= 10;
 SELECT @@GLOBAL.slave_parallel_threads;
 @@GLOBAL.slave_parallel_threads
 10
-SELECT IF(COUNT(*) < 10, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) FROM information_schema.processlist WHERE user = "system user";
-IF(COUNT(*) < 10, "OK", CONCAT("Found too many system user processes: ", COUNT(*)))
+SELECT IF(COUNT(*) < 10, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) as 'OK?' FROM information_schema.processlist WHERE user = "system user";
+OK?
 OK
 SET GLOBAL slave_parallel_threads = @save_slave_parallel_threads;
diff --git a/mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test b/mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test
index 78f6479dea6..0b65a9f59d1 100644
--- a/mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test
+++ b/mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test
@@ -1,3 +1,4 @@
+--disable_service_connection
 call mtr.add_suppression("table or database name '.otherdir'");
 
 select @@ignore_db_dirs;
diff --git a/mysql-test/suite/sys_vars/t/log_disabled_statements_func.test b/mysql-test/suite/sys_vars/t/log_disabled_statements_func.test
index 1e5602eabf1..4774af5c077 100644
--- a/mysql-test/suite/sys_vars/t/log_disabled_statements_func.test
+++ b/mysql-test/suite/sys_vars/t/log_disabled_statements_func.test
@@ -1,7 +1,8 @@
+--source include/no_view_protocol.inc
+
 SET @old_log_output=                @@global.log_output;
 SET @old_log_disable_statements=    @@global.log_disabled_statements;
 
-
 CREATE TABLE t1 (i INT PRIMARY KEY AUTO_INCREMENT, j VARCHAR(255) ) ENGINE=MyISAM;
 insert into t1 (j) values ('a'),('b'),('c'),('d');
 
diff --git a/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.test b/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.test
index b567b7f8854..4643b254d4a 100644
--- a/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.test
+++ b/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.test
@@ -4,7 +4,7 @@ SET @save_slave_parallel_threads= @@GLOBAL.slave_parallel_threads;
 
 # Check that we don't spawn worker threads at server startup, when no
 # slave is configured (MDEV-5289).
-SELECT IF(COUNT(*) < 20, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) FROM information_schema.processlist WHERE user = "system user";
+SELECT IF(COUNT(*) < 20, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) as 'OK?' FROM information_schema.processlist WHERE user = "system user";
 
 SELECT @@GLOBAL.slave_parallel_threads as 'must be 20 because of .cnf';
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
@@ -16,6 +16,6 @@ SELECT @@GLOBAL.slave_parallel_threads as 'must be 0 because of default';
 SET GLOBAL slave_parallel_threads= 10;
 SELECT @@GLOBAL.slave_parallel_threads;
 # Check that we don't spawn worker threads when no slave is started.
-SELECT IF(COUNT(*) < 10, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) FROM information_schema.processlist WHERE user = "system user";
+SELECT IF(COUNT(*) < 10, "OK", CONCAT("Found too many system user processes: ", COUNT(*))) as 'OK?' FROM information_schema.processlist WHERE user = "system user";
 
 SET GLOBAL slave_parallel_threads = @save_slave_parallel_threads;
diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test
index 91654923bd6..0928973d76f 100644
--- a/mysql-test/suite/vcol/t/vcol_misc.test
+++ b/mysql-test/suite/vcol/t/vcol_misc.test
@@ -207,7 +207,9 @@ SELECT COUNT(*) FROM t1;
 INSERT INTO t1 (a,tsv) VALUES (5,DEFAULT);
 INSERT DELAYED INTO t1 (a,tsv) VALUES (6,DEFAULT);
 FLUSH TABLES WITH READ LOCK;
+--disable_view_protocol
 SELECT COUNT(*) FROM t1;
+--enable_view_protocol
 set GLOBAL debug_dbug= @old_debug;
 unlock tables;
 DROP TABLE t1;
diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result
index a48c68e02f7..d36c1c93461 100644
--- a/mysql-test/suite/versioning/r/trx_id.result
+++ b/mysql-test/suite/versioning/r/trx_id.result
@@ -1,3 +1,4 @@
+install plugin test_versioning soname 'test_versioning';
 set default_storage_engine= innodb;
 create or replace table t1 (
 x int,
diff --git a/mysql-test/suite/versioning/t/select.test b/mysql-test/suite/versioning/t/select.test
index 87b3f6173ad..35931907bc2 100644
--- a/mysql-test/suite/versioning/t/select.test
+++ b/mysql-test/suite/versioning/t/select.test
@@ -170,8 +170,10 @@ select * from t1 for system_time all;
 
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
+--disable_view_protocol
 --error ER_TABLE_NOT_LOCKED_FOR_WRITE
 select * from t1 for system_time all for update;
+--enable_view_protocol
 
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
diff --git a/mysql-test/suite/versioning/t/select2.test b/mysql-test/suite/versioning/t/select2.test
index 9d9efdc412e..66d1a88228c 100644
--- a/mysql-test/suite/versioning/t/select2.test
+++ b/mysql-test/suite/versioning/t/select2.test
@@ -136,8 +136,10 @@ select * from t1 for system_time all;
 
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
+--disable_view_protocol
 --error ER_TABLE_NOT_LOCKED_FOR_WRITE
 select * from t1 for system_time as of now() for update;
+--enable_view_protocol
 
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
diff --git a/mysql-test/suite/versioning/t/trx_id.test b/mysql-test/suite/versioning/t/trx_id.test
index 520e9092be8..22e14bc8862 100644
--- a/mysql-test/suite/versioning/t/trx_id.test
+++ b/mysql-test/suite/versioning/t/trx_id.test
@@ -6,9 +6,7 @@ if (!$TEST_VERSIONING_SO)
 --source include/have_partition.inc
 --source include/default_charset.inc
 
---disable_query_log
---eval install plugin test_versioning soname '$TEST_VERSIONING_SO'
---enable_query_log
+install plugin test_versioning soname 'test_versioning';
 
 set default_storage_engine= innodb;
 
@@ -40,15 +38,11 @@ alter table t1
   add period for system_time(s, e),
   add system versioning,
   algorithm=inplace;
---disable_cursor_protocol
 select s from t1 into @trx_start;
---enable_cursor_protocol
 select count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
 
 create or replace table t1 (x int);
---disable_cursor_protocol
 select count(*) from mysql.transaction_registry into @tmp;
---enable_cursor_protocol
 alter table t1
   add column s bigint unsigned as row start,
   add column e bigint unsigned as row end,
@@ -65,15 +59,11 @@ alter table t1
   add period for system_time(s, e),
   add system versioning,
   algorithm=copy;
---disable_cursor_protocol
 select s from t1 into @trx_start;
---enable_cursor_protocol
 select count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
 
 create or replace table t1 (x int);
---disable_cursor_protocol
 select count(*) from mysql.transaction_registry into @tmp;
---enable_cursor_protocol
 alter table t1
   add column s bigint unsigned as row start,
   add column e bigint unsigned as row end,
@@ -132,11 +122,9 @@ commit;
 --sleep 0.01
 set @ts3= sysdate(6);
 
---disable_cursor_protocol
 select sys_start from t1 where x = 1 into @trx_id1;
 select sys_start from t1 where x = 2 into @trx_id2;
 select sys_start from t1 where x = 3 into @trx_id3;
---enable_cursor_protocol
 
 select @trx_id1 < @trx_id2, @trx_id2 < @trx_id3;
 select @ts1 < @ts2, @ts2 < @ts3;
@@ -277,9 +265,7 @@ set @ts1= now(6);
 insert into t1 values (1);
 commit;
 
---disable_cursor_protocol
 select row_start from t1 into @trx_id;
---enable_cursor_protocol
 select trt_begin_ts(@trx_id) <= @ts1 as BEGIN_TS_GOOD;
 
 drop table t1;
diff --git a/mysql-test/suite/versioning/t/update.test b/mysql-test/suite/versioning/t/update.test
index 87c41b1ab16..cfd4627ad13 100644
--- a/mysql-test/suite/versioning/t/update.test
+++ b/mysql-test/suite/versioning/t/update.test
@@ -32,15 +32,11 @@ eval create table t1 (
 with system versioning;
 set timestamp= unix_timestamp('2000-01-01 00:00:00');
 insert into t1 values(1, 1, 1);
---disable_cursor_protocol
 select sys_trx_start into @tmp1 from t1;
---enable_cursor_protocol
 set timestamp= unix_timestamp('2000-01-01 01:00:00');
 update t1 set x= 11, y= 11 where id = 1;
 select @tmp1 < sys_trx_start as A1, x, y from t1;
---disable_cursor_protocol
 select sys_trx_start into @tmp1 from t1;
---enable_cursor_protocol
 set timestamp= unix_timestamp('2000-01-01 02:00:00');
 update t1 set y= 1 where id = 1;
 select @tmp1 = sys_trx_start as A2, x from t1;
@@ -143,18 +139,14 @@ create table t2 like t1;
 insert into t1 values (1, "Jeremy", 3000);
 insert into t2 values (1, "Jeremy", 4000);
 
---disable_cursor_protocol
 select sys_trx_start into @tmp1 from t1;
 select sys_trx_start into @tmp2 from t2;
---enable_cursor_protocol
 update t1, t2 set t1.name= "Jerry", t2.name= "Jerry" where t1.id = t2.id and t1.name = "Jeremy";
 select @tmp1 < sys_trx_start as A1, name from t1;
 select @tmp2 < sys_trx_start as A2, name from t2;
 
---disable_cursor_protocol
 select sys_trx_start into @tmp1 from t1;
 select sys_trx_start into @tmp2 from t2;
---enable_cursor_protocol
 update t1, t2 set t1.salary= 2500, t2.salary= 2500 where t1.id = t2.id and t1.name = "Jerry";
 select @tmp1 = sys_trx_start as B1, salary from t1;
 select @tmp2 = sys_trx_start as B2, salary from t2;
@@ -348,9 +340,7 @@ drop tables t1, t2, t3;
 create or replace table t1 (x int) with system versioning;
 insert t1 values (1);
 update t1 set x= 1;
---disable_cursor_protocol
 select row_start into @r from t1;
---enable_cursor_protocol
 select check_row_ts(row_start, row_end) from t1 for system_time all where row_start = @r;
 drop table t1;
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/index.test b/storage/spider/mysql-test/spider/bugfix/t/index.test
index 1ecc7a84ddf..928e75896d9 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/index.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/index.test
@@ -1,3 +1,4 @@
+--source include/no_view_protocol.inc
 --disable_query_log
 --disable_result_log
 --source ../t/test_init.inc
diff --git a/storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.test b/storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.test
index 70b55a83fd8..3f441c49045 100644
--- a/storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.test
+++ b/storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.test
@@ -129,7 +129,9 @@ SET @old_log_output = @@global.log_output;
 SET global general_log = 1;
 SET global log_output = "TABLE";
 --connection master_1
+--disable_view_protocol
 SELECT * FROM tbl_a;
+--enable_view_protocol
 --connection child2_1
 select argument from mysql.general_log where argument like "select sql_no_cache%" limit 1;
 SET global general_log = @old_general_log;