Merge branch '10.9' into 10.10

mysql-test/suite/perfschema/include/table_io_basic_dml.inc

@@ -5,6 +5,7 @@
 # $table_item = <schema>.<tablename> must be set before sourcing this script.
 #
 
+--disable_ps2_protocol
 insert into marker set a = 1;
 eval insert into $table_item set a = 'foo', b = 1;
 insert into marker set a = 1;
@@ -33,4 +34,4 @@ insert into marker set a = 1;
 eval truncate table $table_item;
 --enable_abort_on_error
 insert into marker set a = 1;
-
+--enable_ps2_protocol

mysql-test/suite/perfschema/t/batch_table_io_func.test

@@ -103,10 +103,12 @@ call before_payload();
 
 # Payload query to analyse: should do batch io on t3
 
+--disable_ps2_protocol
 --disable_result_log
 select t1.*, t2.*, t3.*
   from t1 join t2 using (id1) join t3 using (id2);
 --enable_result_log
+--enable_ps2_protocol
 
 call after_payload();
 
@@ -127,10 +129,12 @@ call before_payload();
 
 # Payload query to analyse: should do batch io on t3
 
+--disable_ps2_protocol
 --disable_result_log
 select t1.*, t2.*, t3.*
   from t1 join t2 using (id1) join t3 using (id2);
 --enable_result_log
+--enable_ps2_protocol
 
 call after_payload();
 

mysql-test/suite/perfschema/t/indexed_table_io.test

@@ -54,6 +54,7 @@ select count(*) from test.index_tab;
 
 # Testing Code
 
+--disable_ps2_protocol
 # For getting avg(a) inspection of
 # - all rows (test.no_index_tab)
 # - all unique index values (test.index_tab, assuming the optimizer decides to
@@ -102,6 +103,7 @@ update performance_schema.setup_consumers set enabled='YES';
 delete from test.index_tab where a = 51;
 update performance_schema.setup_consumers set enabled='NO';
 eval $table_io_select 'index_tab';
+--enable_ps2_protocol
 
 # In case of failures, this will tell if table io are lost.
 show global status like 'performance_schema_%';

mysql-test/suite/perfschema/t/mdl_func.test

@@ -381,7 +381,9 @@ TRUNCATE TABLE performance_schema.events_waits_current;
 
 --connection con1
 
+--disable_ps2_protocol
 SELECT GET_LOCK('test', 0);
+--enable_ps2_protocol
 
 --connection default
 
@@ -396,7 +398,9 @@ execute dump_waits_history_long;
 
 --connection con2
 
+--disable_ps2_protocol
 --send SELECT GET_LOCK('test', 120);
+--enable_ps2_protocol
 
 --connection default
 
@@ -416,8 +420,9 @@ execute dump_waits_history_long;
 --horizontal_results
 
 --connection con1
-
+--disable_ps2_protocol
 SELECT RELEASE_LOCK('test');
+--enable_ps2_protocol
 
 --connection con2
 
@@ -435,8 +440,9 @@ execute dump_waits_history_long;
 --horizontal_results
 
 --connection con2
-
+--disable_ps2_protocol
 SELECT RELEASE_LOCK('test');
+--enable_ps2_protocol
 
 --connection default
 

mysql-test/suite/perfschema/t/misc_global_status.test

@@ -29,7 +29,9 @@ FLUSH STATUS;
 let $initial= `SELECT VARIABLE_VALUE FROM performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range'`;
 
 # Causes Select_range to increment (+1)
+--disable_ps2_protocol
 SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+--enable_ps2_protocol
 
 SELECT * from performance_schema.session_status
   WHERE VARIABLE_NAME = 'Select_range';
@@ -40,7 +42,9 @@ eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance
 
 connect(con1, localhost, user1,,);
 # Causes Select_range to increment (+1)
+--disable_ps2_protocol
 SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+--enable_ps2_protocol
 
 SELECT * from performance_schema.session_status
   WHERE VARIABLE_NAME = 'Select_range';
@@ -51,8 +55,10 @@ eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance
 
 connect(con2, localhost, user2,,);
 # Causes Select_range to increment (+2)
+--disable_ps2_protocol
 SELECT * from test.t_range where (a >= 3) AND (a <= 5);
 SELECT * from test.t_range where (a >= 4) AND (a <= 6);
+--enable_ps2_protocol
 
 SELECT * from performance_schema.session_status
   WHERE VARIABLE_NAME = 'Select_range';
@@ -63,9 +69,11 @@ eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance
 
 connect(con3, localhost, user3,,);
 # Causes Select_range to increment (+3)
+--disable_ps2_protocol
 SELECT * from test.t_range where (a >= 3) AND (a <= 5);
 SELECT * from test.t_range where (a >= 4) AND (a <= 6);
 SELECT * from test.t_range where (a >= 5) AND (a <= 7);
+--enable_ps2_protocol
 
 SELECT * from performance_schema.session_status
   WHERE VARIABLE_NAME = 'Select_range';

mysql-test/suite/perfschema/t/multi_table_io.test

@@ -27,6 +27,7 @@ let $schema_to_dump= 'test','test1';
 # Start event recording
 update performance_schema.setup_consumers set enabled = 'YES';
 
+--disable_ps2_protocol
 # INSERT ... SELECT ...
 insert into test1.t2 select * from test.t1;
 insert into marker set a = 1;
@@ -42,6 +43,7 @@ insert into marker set a = 1;
 # DELETE
 delete from test.t1, test1.t2 using test.t1 inner join test1.t2
 where test.t1.col1 = test1.t2.col1;
+--enable_ps2_protocol
 
 # Stop event recording + pull results
 --source ../include/table_io_result_helper.inc

mysql-test/suite/perfschema/t/query_cache.test

@@ -22,6 +22,7 @@ flush query cache;
 reset query cache;
 flush status;
 
+--disable_ps2_protocol
 select * from t1;
 
 show global status like "Qcache_queries_in_cache";
@@ -47,6 +48,7 @@ select spins from performance_schema.events_waits_current order by event_name li
 
 --replace_result CYCLE {CYCLE_OR_NANOSECOND} NANOSECOND {CYCLE_OR_NANOSECOND}
 select * from performance_schema.setup_timers where name='wait';
+--enable_ps2_protocol
 
 show global status like "Qcache_queries_in_cache";
 show global status like "Qcache_inserts";

mysql-test/suite/perfschema/t/start_server_low_index.test

@@ -27,7 +27,9 @@ create table db1.t1 (a int, b char(10) default 'default',
 #######################
 insert into db1.t1 values('1', 'abc');
 insert into db1.t1 values('2', 'abc');
+--disable_ps2_protocol
 select * from db1.t1 where a='1';
+--enable_ps2_protocol
 
 #####################################################
 # Run few queries on Performance Schema stats tables.
@@ -80,11 +82,15 @@ create table db1.t2 (a int, b char(10) default 'default',
 #######################
 insert into db1.t1 values('3', 'abc');
 insert into db1.t1 values('4', 'abc');
+--disable_ps2_protocol
 select * from db1.t1 where a='1';
+--enable_ps2_protocol
 
 insert into db1.t2 values('1', 'abc');
 insert into db1.t2 values('2', 'abc');
+--disable_ps2_protocol
 select * from db1.t2 where a='1';
+--enable_ps2_protocol
 
 #####################################################
 # Run few queries on Performance Schema stats tables.

mysql-test/suite/perfschema/t/start_server_low_table_lock.test

@@ -20,7 +20,9 @@ create table db1.t1 (a int, b char(10) default 'default');
 #######################
 insert into db1.t1 values('1', 'abc');
 insert into db1.t1 values('2', 'abc');
+--disable_ps2_protocol
 select * from db1.t1 where a='1';
+--enable_ps2_protocol
 
 #####################################################
 # Run few queries on Performance Schema stats tables.
@@ -52,11 +54,15 @@ create table db1.t2 (a int, b char(10) default 'default',
 #######################
 insert into db1.t1 values('3', 'abc');
 insert into db1.t1 values('4', 'abc');
+--disable_ps2_protocol
 select * from db1.t1 where a='1';
+--enable_ps2_protocol
 
 insert into db1.t2 values('1', 'abc');
 insert into db1.t2 values('2', 'abc');
+--disable_ps2_protocol
 select * from db1.t2 where a='1';
+--enable_ps2_protocol
 
 #####################################################
 # Run few queries on Performance Schema stats tables.

mysql-test/suite/perfschema/t/start_server_no_index.test

@@ -21,7 +21,9 @@ create table db1.t1 (a int, b char(10) default 'default',
 #######################
 insert into db1.t1 values('1', 'abc');
 insert into db1.t1 values('2', 'abc');
+--disable_ps2_protocol
 select * from db1.t1 where a='1';
+--enable_ps2_protocol
 
 #####################################################
 # Run few queries on Performance Schema stats tables.

mysql-test/suite/perfschema/t/start_server_no_table_lock.test

@@ -20,7 +20,9 @@ create table db1.t1 (a int, b char(10) default 'default');
 #######################
 insert into db1.t1 values('1', 'abc');
 insert into db1.t1 values('2', 'abc');
+--disable_ps2_protocol
 select * from db1.t1 where a='1';
+--enable_ps2_protocol
 
 #####################################################
 # Run few queries on Performance Schema stats tables.

mysql-test/suite/perfschema/t/trigger_table_io.test

@@ -37,6 +37,7 @@ update performance_schema.setup_consumers set enabled = 'YES';
 
 # Code to test
 
+--disable_ps2_protocol
 insert into marker set a = 1;
 insert into t1 set a = 1, v = 10;
 insert into marker set a = 1;
@@ -63,6 +64,7 @@ insert into marker set a = 1;
 select * from t1;
 insert into marker set a = 1;
 select * from t2;
+--enable_ps2_protocol
 
 # Stop recording events + pull results
 --source ../include/table_io_result_helper.inc