mirror of
https://github.com/MariaDB/server.git
synced 2025-02-18 19:35:36 +01:00
update results for ps2 mode
don't use ps2 mode for selects with side effects
This commit is contained in:
parent
22d3ab5c29
commit
9bc25d9820
3 changed files with 6 additions and 0 deletions
mysql-test
|
@ -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 ;//
|
||||||
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;
|
||||||
--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;
|
||||||
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
|
||||||
|
|
Loading…
Add table
Reference in a new issue