From cfc6ae2893c27bd13d34481555fe63e430cb51de Mon Sep 17 00:00:00 2001
From: unknown <aelkin/elkin@koti.dsl.inet.fi>
Date: Tue, 6 Nov 2007 11:53:47 +0200
Subject: [PATCH] bug#27571

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
---
 mysql-test/suite/binlog/r/binlog_killed.result | 5 ++++-
 mysql-test/suite/binlog/t/binlog_killed.test   | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/binlog/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result
index 9e8f9828d9f..3cd21e3bca1 100644
--- a/mysql-test/suite/binlog/r/binlog_killed.result
+++ b/mysql-test/suite/binlog/r/binlog_killed.result
@@ -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;
diff --git a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test
index 4c2e6fbdc3c..4810246437f 100644
--- a/mysql-test/suite/binlog/t/binlog_killed.test
+++ b/mysql-test/suite/binlog/t/binlog_killed.test
@@ -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() */;