mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
ddc2569826
Under row-based replication, DELETE FROM will now always be replicated as individual row deletions, while TRUNCATE TABLE will always be replicated as a statement. mysql-test/extra/rpl_tests/rpl_ddl.test: Using --echo instead of SELECT to print message. mysql-test/r/binlog_row_mix_innodb_myisam.result: Result change. mysql-test/r/federated.result: Result change. mysql-test/r/range.result: Result change. mysql-test/r/rpl_sp_effects.result: Result change. mysql-test/r/show_check.result: Result change. mysql-test/r/sp-error.result: Result change. mysql-test/r/sp.result: Result change. mysql-test/r/timezone2.result: Result change. mysql-test/r/trigger-grant.result: Result change. mysql-test/r/type_datetime.result: Result change. mysql-test/r/type_ranges.result: Result change. mysql-test/r/type_timestamp.result: Result change. mysql-test/r/view.result: Result change. mysql-test/t/archive.test: Test contain statements that only works for statement-based logging. mysql-test/t/disabled.def: Disabling test due to reported bug. mysql-test/t/federated.test: Adding ORDER BY clause to SELECT statements mysql-test/t/range.test: Adding ORDER BY clause to SELECT (sub-)statement mysql-test/t/rpl_sp_effects.test: Adding ORDER BY clause to SELECT statement. mysql-test/t/show_check.test: Replacing DELETE FROM without WHERE with TRUNCATE TABLE. mysql-test/t/sp-error.test: Replacing DELETE FROM without WHERE with TRUNCATE TABLE. mysql-test/t/sp.test: Adding ORDER BY clause to SELECT statement. mysql-test/t/timezone2.test: Replacing DELETE FROM without WHERE with TRUNCATE TABLE. mysql-test/t/trigger-grant.test: Replacing DELETE FROM without WHERE with TRUNCATE TABLE. mysql-test/t/type_datetime.test: Adding ORDER BY clause to SELECT statement. mysql-test/t/type_ranges.test: Replacing DELETE FROM without WHERE with TRUNCATE TABLE. mysql-test/t/type_timestamp.test: Replacing DELETE FROM without WHERE with TRUNCATE TABLE. mysql-test/t/view.test: Adding ORDER BY clause to SELECT statement. sql/sql_class.h: Adding member function to set replication to statement-based. sql/sql_delete.cc: When row-based replication is used, DELETE FROM will always delete the contents of the table row-by-row and not use delete_all_rows(). mysql-test/extra/rpl_tests/rpl_truncate.test: New BitKeeper file ``mysql-test/extra/rpl_tests/rpl_truncate.test'' mysql-test/extra/rpl_tests/rpl_truncate_helper.inc: New BitKeeper file ``mysql-test/extra/rpl_tests/rpl_truncate_helper.inc'' mysql-test/r/rpl_truncate_2myisam.result: New BitKeeper file ``mysql-test/r/rpl_truncate_2myisam.result'' mysql-test/r/rpl_truncate_3innodb.result: New BitKeeper file ``mysql-test/r/rpl_truncate_3innodb.result'' mysql-test/r/rpl_truncate_7ndb.result: New BitKeeper file ``mysql-test/r/rpl_truncate_7ndb.result'' mysql-test/t/rpl_truncate_2myisam.test: New BitKeeper file ``mysql-test/t/rpl_truncate_2myisam.test'' mysql-test/t/rpl_truncate_3innodb.test: New BitKeeper file ``mysql-test/t/rpl_truncate_3innodb.test'' mysql-test/t/rpl_truncate_7ndb.test: New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb.test''
236 lines
3.3 KiB
Text
236 lines
3.3 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);
|
|
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;
|