bk commit into 5.1 tree (aelkin:1.2612) BUG#27571

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-06 11:53:47+02:00, aelkin@stripped +2 -0
  bug#27571 
  
  non-deterministic tests execution on some platforms.

  mysql-test/suite/binlog/r/binlog_killed.result@stripped, 2007-11-06 11:53:44+02:00, aelkin@stripped +4 -1
    results changed

  mysql-test/suite/binlog/t/binlog_killed.test@stripped, 2007-11-06 11:53:44+02:00, aelkin@stripped +5 -3
    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

diff -Nrup a/mysql-test/suite/binlog/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result
--- a/mysql-test/suite/binlog/r/binlog_killed.result	2007-11-05 22:10:18 +02:00
+++ b/mysql-test/suite/binlog/r/binlog_killed.result	2007-11-06 11:53:44 +02:00
@@ -9,6 +9,9 @@ insert into t2 values (null, null), (nul
 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 -Nrup a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test
--- a/mysql-test/suite/binlog/t/binlog_killed.test	2007-11-05 22:10:18 +02:00
+++ b/mysql-test/suite/binlog/t/binlog_killed.test	2007-11-06 11:53:44 +02:00
@@ -57,6 +57,8 @@ select @result /* must be zero either wa
 
 
 --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() */;