mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
b84e9d10b4
Fix tests for new behaviour: an error is thrown if a NON DETERMINISTIC stored function (SF) is called during statement-based replication (SBR). mysql-test/r/func_time.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/r/gis.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Mark function as DETERMINISTIC so it can be called with no error while doing statement-based replication (SBR). mysql-test/r/grant2.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/r/innodb_notembedded.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/r/ps.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Mark function as DETERMINISTIC so it can be called with no error while doing statement-based replication (SBR). mysql-test/r/query_cache.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/r/query_cache_notembedded.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/r/rpl_sp.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Move test for SF-calls in different replication modes to its own file, rpl_sf. mysql-test/r/rpl_sp_effects.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/r/sp.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Mark function as DETERMINISTIC so it can be called with no error while doing statement-based replication (SBR). mysql-test/r/timezone2.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/func_time.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/gis.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Mark function as DETERMINISTIC so it can be called with no error while doing statement-based replication (SBR). mysql-test/t/grant2.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/innodb_notembedded.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/ps.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/query_cache.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/query_cache_notembedded.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/rpl_sp.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/rpl_sp_effects.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). mysql-test/t/sp.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Mark function as DETERMINISTIC so it can be called with no error while doing statement-based replication (SBR). mysql-test/t/timezone2.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Modify test that contains non-deterministic functions so it can still be called with no error while doing statement-based replication (SBR). sql/item_func.cc: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR If 'log_bin_trust_function_creators' variable is set, don't throw an error on calling a non-deterministc function in statement-based replication (SBR). sql/sql_parse.cc: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Do not throw an error on calling a NON DETERMINISTIC stored procedure (SP) while doing statement-based replication (SBR), as the routine body is executed statement-by-statement. mysql-test/r/rpl_sf.result: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Test for stored function (SF) calls in different replication modes. NON DETERMINISTIC SFs are not allowed while doing statement-based replication (SBR). mysql-test/t/rpl_sf.test: Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR Test for stored function (SF) calls in different replication modes. NON DETERMINISTIC SFs are not allowed while doing statement-based replication (SBR).
238 lines
3.4 KiB
Text
238 lines
3.4 KiB
Text
stop slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
reset master;
|
|
reset slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
start slave;
|
|
drop procedure if exists p1;
|
|
drop procedure if exists p2;
|
|
drop function if exists f1;
|
|
drop table if exists t1,t2;
|
|
drop view if exists v1;
|
|
create table t1 (a int);
|
|
SET GLOBAL log_bin_trust_function_creators = 1;
|
|
create procedure p1()
|
|
begin
|
|
declare spv int default 0;
|
|
while spv < 5 do
|
|
insert into t1 values(spv+1);
|
|
set spv=spv+1;
|
|
end while;
|
|
end//
|
|
call p1();
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
create procedure p2()
|
|
begin
|
|
declare a int default 4;
|
|
create table t2 as select a;
|
|
end//
|
|
call p2();
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a
|
|
4
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a
|
|
4
|
|
drop procedure p1;
|
|
drop procedure p2;
|
|
drop table t2;
|
|
create function f1(x int) returns int
|
|
begin
|
|
insert into t1 values(x);
|
|
return x+1;
|
|
end//
|
|
create procedure p1(a int, b int)
|
|
begin
|
|
declare v int default f1(5);
|
|
if (f1(6)) then
|
|
select 'yes';
|
|
end if;
|
|
set v = f1(7);
|
|
while f1(8) < 1 do
|
|
select 'this cant be';
|
|
end while;
|
|
end//
|
|
call p1(f1(1), f1(2));
|
|
yes
|
|
yes
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a
|
|
1
|
|
1
|
|
2
|
|
2
|
|
3
|
|
4
|
|
5
|
|
5
|
|
6
|
|
7
|
|
8
|
|
create table t2(a int);
|
|
insert into t2 values (10),(11);
|
|
SELECT a,f1(a) FROM t2 ORDER BY a;
|
|
a f1(a)
|
|
10 11
|
|
11 12
|
|
insert into t2 select f1(3);
|
|
SELECT 'master:',a FROM t1 ORDER BY a;
|
|
master: a
|
|
master: 1
|
|
master: 1
|
|
master: 2
|
|
master: 2
|
|
master: 3
|
|
master: 3
|
|
master: 4
|
|
master: 5
|
|
master: 5
|
|
master: 6
|
|
master: 7
|
|
master: 8
|
|
master: 10
|
|
master: 11
|
|
SELECT 'slave:',a FROM t1 ORDER BY a;
|
|
slave: a
|
|
slave: 1
|
|
slave: 1
|
|
slave: 2
|
|
slave: 2
|
|
slave: 3
|
|
slave: 3
|
|
slave: 4
|
|
slave: 5
|
|
slave: 5
|
|
slave: 6
|
|
slave: 7
|
|
slave: 8
|
|
slave: 10
|
|
slave: 11
|
|
drop procedure p1;
|
|
delete from t1;
|
|
delete from t2;
|
|
delete from t1;
|
|
insert into t2 values(1),(2);
|
|
create view v1 as select f1(a) as f from t2;
|
|
select * from v1 order by f;
|
|
f
|
|
2
|
|
3
|
|
SELECT 'master:',a FROM t1 ORDER BY a;
|
|
master: a
|
|
master: 1
|
|
master: 2
|
|
SELECT 'slave:',a FROM t1 ORDER BY a;
|
|
slave: a
|
|
slave: 1
|
|
slave: 2
|
|
drop view v1;
|
|
delete from t1;
|
|
prepare s1 from 'select f1(?)';
|
|
set @xx=123;
|
|
execute s1 using @xx;
|
|
f1(?)
|
|
124
|
|
SELECT 'master:',a FROM t1 ORDER BY a;
|
|
master: a
|
|
master: 123
|
|
SELECT 'slave:',a FROM t1 ORDER BY a;
|
|
slave: a
|
|
slave: 123
|
|
delete from t1;
|
|
create procedure p1(spv int)
|
|
begin
|
|
declare c cursor for select f1(spv) from t2;
|
|
while (spv > 2) do
|
|
open c;
|
|
fetch c into spv;
|
|
close c;
|
|
set spv= spv - 10;
|
|
end while;
|
|
end//
|
|
call p1(15);
|
|
SELECT 'master:',a FROM t1 ORDER BY a;
|
|
master: a
|
|
master: 6
|
|
master: 6
|
|
master: 15
|
|
master: 15
|
|
SELECT 'slave:',a FROM t1 ORDER BY a;
|
|
slave: a
|
|
slave: 6
|
|
slave: 6
|
|
slave: 15
|
|
slave: 15
|
|
drop procedure p1;
|
|
drop function f1;
|
|
drop table t1,t2;
|
|
create table t1 (a int);
|
|
create procedure p1()
|
|
begin
|
|
insert into t1 values(@x);
|
|
set @x=@x+1;
|
|
insert into t1 values(@x);
|
|
if (f2()) then
|
|
insert into t1 values(1243);
|
|
end if;
|
|
end//
|
|
create function f2() returns int
|
|
begin
|
|
insert into t1 values(@z);
|
|
set @z=@z+1;
|
|
insert into t1 values(@z);
|
|
return 0;
|
|
end//
|
|
create function f1() returns int
|
|
begin
|
|
insert into t1 values(@y);
|
|
call p1();
|
|
return 0;
|
|
end//
|
|
set @x=10;
|
|
set @y=20;
|
|
set @z=100;
|
|
select f1();
|
|
f1()
|
|
0
|
|
set @x=30;
|
|
call p1();
|
|
SELECT 'master', a FROM t1 ORDER BY a;
|
|
master a
|
|
master 10
|
|
master 11
|
|
master 20
|
|
master 30
|
|
master 31
|
|
master 100
|
|
master 101
|
|
master 101
|
|
master 102
|
|
SELECT 'slave', a FROM t1 ORDER BY a;
|
|
slave a
|
|
slave 10
|
|
slave 11
|
|
slave 20
|
|
slave 30
|
|
slave 31
|
|
slave 100
|
|
slave 101
|
|
slave 101
|
|
slave 102
|
|
drop table t1;
|
|
drop function f1;
|
|
drop function f2;
|
|
drop procedure p1;
|
|
SET GLOBAL log_bin_trust_function_creators = 0;
|