MDEV-16708: more fixes to test cases

dmitryshulga · vuvova · commit 510662e81bf4 · 2021-06-17T19:30:24.000+02:00
diff --git a/mysql-test/main/cte_recursive.test b/mysql-test/main/cte_recursive.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 --source include/default_optimizer_switch.inc
 
 create table t1 (a int, b varchar(32));
diff --git a/mysql-test/main/events_restart.test b/mysql-test/main/events_restart.test
@@ -1,6 +1,6 @@
 # Can't test with embedded server that doesn't support grants
 -- source include/not_embedded.inc
-
+--disable_ps_protocol
 call mtr.add_suppression("Column count of mysql.event is wrong. Expected .*, found .*\. The table is probably corrupted");
 
 let $collation_server=`select @@collation_server`;
@@ -172,3 +172,4 @@ select name, originator, status from mysql.event;
 
 # Cleanup
 drop event ev;
+--enable_ps_protocol
diff --git a/mysql-test/main/features.test b/mysql-test/main/features.test
@@ -1,4 +1,8 @@
 # Testing of feature statistics
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 
 -- source include/have_geometry.inc
 
diff --git a/mysql-test/main/fetch_first.test b/mysql-test/main/fetch_first.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 --echo #
 --echo # The following entries are meant for testing the parser, ensuring
 --echo # the right values are passed down to the executor, for all possible
diff --git a/mysql-test/main/func_group.test b/mysql-test/main/func_group.test
@@ -2,6 +2,11 @@
 # simple test of all group functions
 #
 
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
+
 --disable_warnings
 drop table if exists t1,t2,t3,t4,t5,t6;
 --enable_warnings
diff --git a/mysql-test/main/limit_rows_examined.test b/mysql-test/main/limit_rows_examined.test
@@ -2,6 +2,11 @@
 # Tests for LIMIT ROWS EXAMINED, MDEV-28
 #
 
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
+
 --source include/default_optimizer_switch.inc
 call mtr.add_suppression("Sort aborted.*");
 
diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 --source include/not_embedded.inc
 --source include/have_sequence.inc
 SELECT table_name, column_name FROM information_schema.columns where table_name="OPTIMIZER_TRACE";
diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test
@@ -1906,6 +1906,8 @@ drop table t1;
 --echo # MDEV-19682 sql_mode="oracle" does not support sysdate
 --echo #
 
+--enable_prepare_warnings
+
 --error ER_BAD_FIELD_ERROR
 SELECT sysdate LIKE '____-__-__ __:__:__';
 --error ER_BAD_FIELD_ERROR
@@ -1951,6 +1953,8 @@ END;
 $$
 DELIMITER ;$$
 
+--disable_prepare_warnings
+
 --echo #
 --echo # End of 10.6 tests
 --echo #
diff --git a/mysql-test/main/parser_stack.test b/mysql-test/main/parser_stack.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 #
 # These tests are designed to cause an internal parser stack overflow,
 # and trigger my_yyoverflow().
diff --git a/mysql-test/main/skip_grants.result b/mysql-test/main/skip_grants.result
@@ -52,8 +52,6 @@ DROP FUNCTION f3;
 # Bug #26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
 #
 set global event_scheduler=1;
-Warnings:
-Note	1408	Event Scheduler: Loaded 0 events
 set global event_scheduler=0;
 #
 # Bug#26285 Selecting information_schema crahes server
diff --git a/mysql-test/main/skip_grants.test b/mysql-test/main/skip_grants.test
@@ -1,6 +1,6 @@
 # This tests not performed with embedded server
 -- source include/not_embedded.inc
-
+-- disable_ps_protocol
 use test;
 
 #
@@ -92,7 +92,9 @@ DROP FUNCTION f3;
 --echo #
 --echo # Bug #26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
 --echo #
+--disable_warnings
 set global event_scheduler=1;
+--enable_warnings
 set global event_scheduler=0;
 
 --echo #
@@ -161,6 +163,8 @@ drop user baz@baz;
 # need to restart the server to restore the --skip-grant state
 --source include/restart_mysqld.inc
 
+--enable_ps_protocol
+
 --echo #
 --echo # End of 10.3 tests
 --echo #
diff --git a/mysql-test/main/sp-row.test b/mysql-test/main/sp-row.test
@@ -2,7 +2,10 @@
 --echo # MDEV-10914 ROW data type for stored routine variables
 --echo #
 
-
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 
 --echo #
 --echo # ROW of ROWs is not supported yet
diff --git a/mysql-test/suite/compat/oracle/t/sp-row.test b/mysql-test/suite/compat/oracle/t/sp-row.test
@@ -1,3 +1,8 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
+
 SET sql_mode=ORACLE;
 
 
diff --git a/mysql-test/suite/plugins/t/test_sql_service.test b/mysql-test/suite/plugins/t/test_sql_service.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 
 --source include/not_embedded.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 --let $rpl_topology=1->2
 --source include/rpl_init.inc
 --source include/have_innodb.inc
diff --git a/mysql-test/suite/sys_vars/t/stored_program_cache_func.test b/mysql-test/suite/sys_vars/t/stored_program_cache_func.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 create procedure p1() select 1;
 
 flush status;
diff --git a/mysql-test/suite/versioning/t/cte.test b/mysql-test/suite/versioning/t/cte.test
@@ -1,3 +1,7 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 --source include/have_innodb.inc
 --source include/default_optimizer_switch.inc
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
	`1`	+if (`SELECT $PS_PROTOCOL != 0`)
	`2`	`+{`
	`3`	`+ --skip Test temporarily disabled for ps-protocol`
	`4`	`+}`
`1`	`5`	`#`
`2`	`6`	`# These tests are designed to cause an internal parser stack overflow,`
`3`	`7`	`# and trigger my_yyoverflow().`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,6 @@ DROP FUNCTION f3;`
`52`	`52`	`# Bug #26807 "set global event_scheduler=1" and --skip-grant-tables crashes server`
`53`	`53`	`#`
`54`	`54`	`set global event_scheduler=1;`
`55`		`-Warnings:`
`56`		`-Note 1408 Event Scheduler: Loaded 0 events`
`57`	`55`	`set global event_scheduler=0;`
`58`	`56`	`#`
`59`	`57`	`# Bug#26285 Selecting information_schema crahes server`