mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
95f3db7be1
Query_log_event::error_code A query can perform completely having the local var error of mysql_$query zero, where $query in insert, update, delete, load, and be binlogged with error_code e.g KILLED_QUERY while there is no reason do to so. That can happen because Query_log_event consults thd->killed flag to evaluate error_code. Fixed with implementing a scheme suggested and partly implemented at time of bug@22725 work-on. error_status is cached immediatly after the control leaves the main rows-loop and that instance always corresponds to `error' the local of mysql_$query functions. The cached value is passed to Query_log_event constructor, not the default thd->killed which can be changed in between of the caching and the constructing. mysql-test/r/binlog_killed.result: results changed mysql-test/t/binlog_killed.test: Demonstrating that effective killing during rows-loop execution leads to the speficied actions: binlogging with the error for a query modified a not-transactional table or rolling back effects for transactional table; fixing possible non-determinism with ID when query_log_enabled; leave commented out tests for multi-update,delete due to another bug; removing an obsolete tests template; changing system rm to --remove_file. sql/log_event.cc: adding killed status arg sql/log_event.h: added killed status arg sql/sql_delete.cc: deploying the update part patch for delete, multi-delete sql/sql_insert.cc: deploying the update-part patch for insert..select sql/sql_load.cc: deploying the update-part patch for load data. simulation added. sql/sql_update.cc: Impementing the fix as described in the comments left by bug@22725. Also simulation of killing after the loop that would affect binlogging in the old code. mysql-test/t/binlog_killed_bug27571-master.opt: post rows-loop killing simulation's options mysql-test/t/binlog_killed_bug27571.test: Checking that if killing happens inbetween of the end of rows loop and recording into binlog that will not lead to recording any error incl the killed error. mysql-test/t/binlog_killed_simulate-master.opt: simulation options mysql-test/t/binlog_killed_simulate.test: tests for a query (update is choosen) being killed after the row-loop; load data killed within the loop - effective killed error in the event is gained.
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
|