diff --git a/mysql-test/include/delete_use_source_cases.inc b/mysql-test/include/delete_use_source_cases.inc index 24408b7dd50..ce0507d56b1 100644 --- a/mysql-test/include/delete_use_source_cases.inc +++ b/mysql-test/include/delete_use_source_cases.inc @@ -156,10 +156,12 @@ delimiter ;// set @a:=7; create table tmp as select * from t1 where c3 < @a order by c3 limit 1; +--disable_ps2_protocol # because SELECT with side effects select f1(@a); insert into tmp(c1,c2,c3) select * from t1 where c3 < @a order by c3 limit 1; select f1(@a); +--enable_ps2_protocol --sorted_result select * from t1; insert into t1(c1,c2,c3) select c1,c2,c3 from tmp; diff --git a/mysql-test/include/delete_use_source_cases_memory.inc b/mysql-test/include/delete_use_source_cases_memory.inc index 7a61b59e2a5..e1b49f54e82 100644 --- a/mysql-test/include/delete_use_source_cases_memory.inc +++ b/mysql-test/include/delete_use_source_cases_memory.inc @@ -195,10 +195,12 @@ delimiter ;// set @a:=7; create table tmp as select * from t1 where c3 < @a order by c3 limit 1; +--disable_ps2_protocol # because SELECT with side effects select f1(@a); insert into tmp(c1,c2,c3) select * from t1 where c3 < @a order by c3 limit 1; select f1(@a); +--enable_ps2_protocol --sorted_result select * from t1; insert into t1(c1,c2,c3) select c1,c2,c3 from tmp; diff --git a/mysql-test/main/update.test b/mysql-test/main/update.test index 89bc71dc695..f24bf9b140a 100644 --- a/mysql-test/main/update.test +++ b/mysql-test/main/update.test @@ -708,6 +708,7 @@ drop table t1; --echo # MDEV-29189: Second execution of SF using UPDATE?DELETE --echo # after reported error by the first execution --echo # +--disable_ps2_protocol # because SELECT with side effects CREATE TABLE t1 (c int); @@ -739,5 +740,6 @@ SELECT * FROM t1; DROP FUNCTION f1; DROP FUNCTION f2; DROP TABLE t1; +--enable_ps2_protocol --echo # End of MariaDB 10.10 tests