mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
200f0531ef
into koti.dsl.inet.fi:/home/elkin/MySQL/5.1-merge-bug27571 client/mysql.cc: Auto merged mysql-test/r/ctype_euckr.result: Auto merged mysql-test/r/ctype_uca.result: Auto merged mysql-test/suite/binlog/r/binlog_killed.result: Auto merged mysql-test/suite/binlog/t/binlog_killed.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged strings/ctype-euc_kr.c: Auto merged mysql-test/suite/rpl/r/rpl_sp_effects.result: manual merge ul mysql-test/suite/rpl/t/rpl_sp_effects.test: manual merge sql/slave.cc: leaving for manual merge sql/sql_delete.cc: leaving for manual merge sql/sql_insert.cc: leaving for manual merge sql/sql_load.cc: leaving for manual merge sql/sql_update.cc: leaving for manual merge
118 lines
2.8 KiB
Text
118 lines
2.8 KiB
Text
create table t1 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB;
|
|
create table t2 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=MyISAM;
|
|
create table t3 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB;
|
|
select get_lock("a", 20);
|
|
get_lock("a", 20)
|
|
1
|
|
reset master;
|
|
insert into t2 values (null, null), (null, get_lock("a", 10));
|
|
select @result /* must be zero either way */;
|
|
@result
|
|
0
|
|
delete from t1;
|
|
delete from t2;
|
|
insert into t1 values (1,1),(2,2);
|
|
begin;
|
|
update t1 set b=11 where a=2;
|
|
update t1 set b=b+10;
|
|
kill query ID;
|
|
rollback;
|
|
ERROR 70100: Query execution was interrupted
|
|
select * from t1 /* must be the same as before (1,1),(2,2) */;
|
|
a b
|
|
1 1
|
|
2 2
|
|
begin;
|
|
delete from t1 where a=2;
|
|
delete from t1 where a=2;
|
|
kill query ID;
|
|
rollback;
|
|
ERROR 70100: Query execution was interrupted
|
|
select * from t1 /* must be the same as before (1,1),(2,2) */;
|
|
a b
|
|
1 1
|
|
2 2
|
|
drop table if exists t4;
|
|
create table t4 (a int, b int) engine=innodb;
|
|
insert into t4 values (3, 3);
|
|
begin;
|
|
insert into t1 values (3, 3);
|
|
begin;
|
|
insert into t1 select * from t4 for update;
|
|
kill query ID;
|
|
rollback;
|
|
ERROR 70100: Query execution was interrupted
|
|
rollback;
|
|
select * from t1 /* must be the same as before (1,1),(2,2) */;
|
|
a b
|
|
1 1
|
|
2 2
|
|
drop table t4;
|
|
create function bug27563(n int)
|
|
RETURNS int(11)
|
|
DETERMINISTIC
|
|
begin
|
|
if n > 1 then
|
|
select get_lock("a", 10) into @a;
|
|
end if;
|
|
return n;
|
|
end|
|
|
delete from t2;
|
|
insert into t2 values (1,1), (2,2);
|
|
reset master;
|
|
select get_lock("a", 20);
|
|
get_lock("a", 20)
|
|
1
|
|
update t2 set b=b + bug27563(b) order by a;
|
|
kill query ID;
|
|
ERROR 70100: Query execution was interrupted
|
|
select * from t2 /* must be (1,2), (2,2) */;
|
|
a b
|
|
1 2
|
|
2 2
|
|
show master status /* must have the update event more to FD */;
|
|
File Position Binlog_Do_DB Binlog_Ignore_DB
|
|
master-bin.000001 211
|
|
select
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null;
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null
|
|
1
|
|
select 0 /* must return 0 to mean the killed query is in */;
|
|
0
|
|
0
|
|
select RELEASE_LOCK("a");
|
|
RELEASE_LOCK("a")
|
|
1
|
|
delete from t2;
|
|
insert into t2 values (1,1), (2,2);
|
|
reset master;
|
|
select get_lock("a", 20);
|
|
get_lock("a", 20)
|
|
1
|
|
delete from t2 where a=1 or a=bug27563(2) order by a;
|
|
kill query ID;
|
|
ERROR 70100: Query execution was interrupted
|
|
select * from t2 /* must be (1,2), (2,2) */;
|
|
a b
|
|
1 1
|
|
2 2
|
|
show master status /* must have the update event more to FD */;
|
|
File Position Binlog_Do_DB Binlog_Ignore_DB
|
|
master-bin.000001 98
|
|
select
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null;
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null
|
|
1
|
|
select 0 /* must return 0 to mean the killed query is in */;
|
|
0
|
|
0
|
|
select RELEASE_LOCK("a");
|
|
RELEASE_LOCK("a")
|
|
1
|
|
drop function bug27563;
|
|
drop table t1,t2,t3;
|
|
end of the tests
|