bug#27571

non-deterministic tests execution on some platforms.
parent 3f7bf588
...@@ -9,6 +9,9 @@ insert into t2 values (null, null), (null, get_lock("a", 10)); ...@@ -9,6 +9,9 @@ insert into t2 values (null, null), (null, get_lock("a", 10));
select @result /* must be zero either way */; select @result /* must be zero either way */;
@result @result
0 0
select RELEASE_LOCK("a");
RELEASE_LOCK("a")
1
delete from t1; delete from t1;
delete from t2; delete from t2;
insert into t1 values (1,1),(2,2); insert into t1 values (1,1),(2,2);
...@@ -51,7 +54,7 @@ RETURNS int(11) ...@@ -51,7 +54,7 @@ RETURNS int(11)
DETERMINISTIC DETERMINISTIC
begin begin
if @b > 0 then if @b > 0 then
select get_lock("a", 10) into @a; select get_lock("a", 20) into @a;
else else
set @b= 1; set @b= 1;
end if; end if;
......
...@@ -57,6 +57,8 @@ select @result /* must be zero either way */; ...@@ -57,6 +57,8 @@ select @result /* must be zero either way */;
--remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog --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 # bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
...@@ -192,7 +194,7 @@ RETURNS int(11) ...@@ -192,7 +194,7 @@ RETURNS int(11)
DETERMINISTIC DETERMINISTIC
begin begin
if @b > 0 then if @b > 0 then
select get_lock("a", 10) into @a; select get_lock("a", 20) into @a;
else else
set @b= 1; set @b= 1;
end if; end if;
...@@ -220,7 +222,7 @@ connection con1; ...@@ -220,7 +222,7 @@ connection con1;
eval kill query $ID; eval kill query $ID;
connection con2; connection con2;
--error 0,ER_QUERY_INTERRUPTED --error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
reap; reap;
select * from t4 order by b /* must be (1,1), (1,2) */; 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() */; select @b /* must be 1 at the end of a stmt calling bug27563() */;
...@@ -263,7 +265,7 @@ connection con1; ...@@ -263,7 +265,7 @@ connection con1;
eval kill query $ID; eval kill query $ID;
connection con2; connection con2;
--error 0,ER_QUERY_INTERRUPTED --error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
reap; reap;
select count(*) from t4 /* must be 1 */; select count(*) from t4 /* must be 1 */;
select @b /* must be 1 at the end of a stmt calling bug27563() */; select @b /* must be 1 at the end of a stmt calling bug27563() */;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment