From: Andrei Elkin
Date: October 31 2011 1:53pm
Subject: bzr push into mysql-trunk branch (andrei.elkin:3539 to 3540)
List-Archive: http://lists.mysql.com/commits/141676
Message-Id: <201110311353.p9VDr4DN025651@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3540 Andrei Elkin	2011-10-31
      windows sometimes times out on rpl_parallel,sequential.
      The tests load is made smaller on win platform.

    modified:
      mysql-test/extra/rpl_tests/rpl_parallel_load.test
 3539 Alexander Nozdrin	2011-10-31
      Fix for Bug#12652873 - 61392: CONTINUE HANDLER FOR NOT FOUND BEING
      TRIGGERED FROM INTERNAL STORED FUNCTION.
      
      The problem was that RETURN statement in stored programs did not
      clear the Diagnostics Area, as it should have done according to
      the SQL Standard.
      
      The user-visible problem was that in some cases an SQL-condition,
      raised in the nested function call, would be visible in the outer
      scope, which in turn would lead to incorrect handler activation.
      
      The fix is to clear the Diagnostics Area before executing RETURN
      statement.
      
      Note, that after the patch, there is no way to throw an SQL-warning
      out of a stored function. From the user's view point, he/she will not
      get any warning, even if there were warnings, raised during
      the function execution.
      
      This change is backward incompatible, but it makes the behaviour of
      stored programs more in line with The Standard.

    modified:
      mysql-test/r/func_rollback.result
      mysql-test/r/signal.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp.result
      mysql-test/r/view_grant.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/t/signal.test
      mysql-test/t/sp-error.test
      sql/sp_head.cc
=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2011-08-19 13:04:28 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2011-10-31 13:52:32 +0000
@@ -12,7 +12,7 @@ let $iter = 50;
 disable_query_log;
 if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE"`)
 {
-  let $iter = 100;
+  let $iter = 30;
 }
 enable_query_log;
 

No bundle (reason: useless for push emails).