mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug#27571

Browse source 
non-deterministic tests execution on some platforms.


mysql-test/suite/binlog/r/binlog_killed.result:
  results changed
mysql-test/suite/binlog/t/binlog_killed.test:
  correcting the prev test's cleanup;
  increasing time to wait by to be killed query;
  adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query
This commit is contained in:
unknown 2007-11-06 11:53:47 +02:00
parent 5672c2e57c
commit cfc6ae2893
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/suite/binlog/r/binlog_killed.result
View file

@ -9,6 +9,9 @@ insert into t2 values (null, null), (null, get_lock("a", 10));
select @result /* must be zero either way */;
@result
0
select RELEASE_LOCK("a");
RELEASE_LOCK("a")
1
delete from t1;
delete from t2;
insert into t1 values (1,1),(2,2);
@ -51,7 +54,7 @@ RETURNS int(11)
DETERMINISTIC
begin
if @b > 0 then
select get_lock("a", 10) into @a;
select get_lock("a", 20) into @a;
else
set @b= 1;
end if;

8
mysql-test/suite/binlog/t/binlog_killed.test
View file

@ -57,6 +57,8 @@ select @result /* must be zero either way */;
--remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
connection con1;
select RELEASE_LOCK("a");
#
# bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
@ -192,7 +194,7 @@ RETURNS int(11)
DETERMINISTIC
begin
if @b > 0 then
select get_lock("a", 10) into @a;
select get_lock("a", 20) into @a;
else
set @b= 1;
end if;
@ -220,7 +222,7 @@ connection con1;
eval kill query $ID;
connection con2;
--error 0,ER_QUERY_INTERRUPTED
--error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
reap;
select * from t4 order by b /* must be (1,1), (1,2) */;
select @b /* must be 1 at the end of a stmt calling bug27563() */;
@ -263,7 +265,7 @@ connection con1;
eval kill query $ID;
connection con2;
--error 0,ER_QUERY_INTERRUPTED
--error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
reap;
select count(*) from t4 /* must be 1 */;
select @b /* must be 1 at the end of a stmt calling bug27563() */;