Merge 10.6 into 10.7

4 files changed, 42 insertions, 0 deletions

diff --git a/mysql-test/main/check_view_protocol.result b/mysql-test/main/check_view_protocol.result
new file mode 100644
index 00000000000..697bc759498
--- /dev/null
+++ b/mysql-test/main/check_view_protocol.result
@@ -0,0 +1,19 @@
+flush status;
+create table t1 (a int);
+insert into t1 (a) values (1);
+create table t2 (b int);
+insert into t2 (b) values (2);
+select * from t1;
+a
+1
+show status like 'Opened_views';
+Variable_name	Value
+Opened_views	1
+flush status;
+select * from t2;
+b
+2
+show status like 'Opened_views';
+Variable_name	Value
+Opened_views	0
+drop table t1, t2;
diff --git a/mysql-test/main/check_view_protocol.test b/mysql-test/main/check_view_protocol.test
new file mode 100644
index 00000000000..c4d5670669c
--- /dev/null
+++ b/mysql-test/main/check_view_protocol.test
@@ -0,0 +1,21 @@
+-- source include/have_view_protocol.inc
+
+flush status;
+
+create table t1 (a int);
+insert into t1 (a) values (1);
+create table t2 (b int);
+insert into t2 (b) values (2);
+select * from t1;
+show status like 'Opened_views';
+
+flush status;
+--disable_view_protocol
+select * from t2;
+--enable_view_protocol
+
+show status like 'Opened_views';
+
+drop table t1, t2;
+
+
diff --git a/mysql-test/main/session_tracker_last_gtid.result b/mysql-test/main/session_tracker_last_gtid.result
index 795d0aaa2a2..5a78d5f03ce 100644
--- a/mysql-test/main/session_tracker_last_gtid.result
+++ b/mysql-test/main/session_tracker_last_gtid.result
@@ -32,3 +32,4 @@ drop table t1;
 -- last_gtid
 -- 0-1-1002
 
+reset master;
diff --git a/mysql-test/main/session_tracker_last_gtid.test b/mysql-test/main/session_tracker_last_gtid.test
index 24cf2104a0c..58aee2de837 100644
--- a/mysql-test/main/session_tracker_last_gtid.test
+++ b/mysql-test/main/session_tracker_last_gtid.test
@@ -17,3 +17,4 @@ select @@last_gtid;
 drop table t1;
 
 --disable_session_track_info
+reset master;