Commit 9bc25d98 authored by Sergei Golubchik's avatar Sergei Golubchik

update results for ps2 mode

don't use ps2 mode for selects with side effects
parent 22d3ab5c
...@@ -156,10 +156,12 @@ delimiter ;// ...@@ -156,10 +156,12 @@ delimiter ;//
set @a:=7; set @a:=7;
create table tmp as select * from t1 where c3 < @a create table tmp as select * from t1 where c3 < @a
order by c3 limit 1; order by c3 limit 1;
--disable_ps2_protocol # because SELECT with side effects
select f1(@a); select f1(@a);
insert into tmp(c1,c2,c3) select * from t1 where c3 < @a insert into tmp(c1,c2,c3) select * from t1 where c3 < @a
order by c3 limit 1; order by c3 limit 1;
select f1(@a); select f1(@a);
--enable_ps2_protocol
--sorted_result --sorted_result
select * from t1; select * from t1;
insert into t1(c1,c2,c3) select c1,c2,c3 from tmp; insert into t1(c1,c2,c3) select c1,c2,c3 from tmp;
......
...@@ -195,10 +195,12 @@ delimiter ;// ...@@ -195,10 +195,12 @@ delimiter ;//
set @a:=7; set @a:=7;
create table tmp as select * from t1 where c3 < @a create table tmp as select * from t1 where c3 < @a
order by c3 limit 1; order by c3 limit 1;
--disable_ps2_protocol # because SELECT with side effects
select f1(@a); select f1(@a);
insert into tmp(c1,c2,c3) select * from t1 where c3 < @a insert into tmp(c1,c2,c3) select * from t1 where c3 < @a
order by c3 limit 1; order by c3 limit 1;
select f1(@a); select f1(@a);
--enable_ps2_protocol
--sorted_result --sorted_result
select * from t1; select * from t1;
insert into t1(c1,c2,c3) select c1,c2,c3 from tmp; insert into t1(c1,c2,c3) select c1,c2,c3 from tmp;
......
...@@ -708,6 +708,7 @@ drop table t1; ...@@ -708,6 +708,7 @@ drop table t1;
--echo # MDEV-29189: Second execution of SF using UPDATE?DELETE --echo # MDEV-29189: Second execution of SF using UPDATE?DELETE
--echo # after reported error by the first execution --echo # after reported error by the first execution
--echo # --echo #
--disable_ps2_protocol # because SELECT with side effects
CREATE TABLE t1 (c int); CREATE TABLE t1 (c int);
...@@ -739,5 +740,6 @@ SELECT * FROM t1; ...@@ -739,5 +740,6 @@ SELECT * FROM t1;
DROP FUNCTION f1; DROP FUNCTION f1;
DROP FUNCTION f2; DROP FUNCTION f2;
DROP TABLE t1; DROP TABLE t1;
--enable_ps2_protocol
--echo # End of MariaDB 10.10 tests --echo # End of MariaDB 10.10 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment