From: Date: July 3 2009 10:29am
Subject: bzr commit into mysql-pe branch (bernt.johnsen:3424)
List-Archive: http://lists.mysql.com/commits/77856
Message-Id: <0KM7003AJ68I9UC0@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_1Ij/7Jb7nvEsszTne/s/uQ)"

--Boundary_(ID_1Ij/7Jb7nvEsszTne/s/uQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///export/home/tmp/mysql/pe/ based on revid:joro@stripped

 3424 Bernt M. Johnsen	2009-07-03 [merge]
      Prepare for push

    modified:
      mysql-test/r/sp-fib.result
      mysql-test/t/sp-fib.test
=== modified file 'mysql-test/r/sp-fib.result'
--- a/mysql-test/r/sp-fib.result	2009-06-04 11:53:15 +0000
+++ b/mysql-test/r/sp-fib.result	2009-07-03 08:23:16 +0000
@@ -10,24 +10,17 @@ declare c cursor for select f from t3 or
 open c;
 fetch c into y;
 fetch c into x;
-close c;
 insert into t3 values (x+y);
 call fib(n-1);
+## Close the cursor AFTER the recursion to ensure that the stack
+## frame is somewhat intact.
+close c;
 end;
 end if;
 end|
 set @@max_sp_recursion_depth= 20|
 insert into t3 values (0), (1)|
-call fib(3)|
-select * from t3 order by f asc|
-f
-0
-1
-1
-2
-truncate table t3|
-insert into t3 values (0), (1)|
-call fib(10)|
+call fib(4)|
 select * from t3 order by f asc|
 f
 0
@@ -35,12 +28,6 @@ f
 1
 2
 3
-5
-8
-13
-21
-34
-55
 drop table t3|
 drop procedure fib|
 set @@max_sp_recursion_depth= 0|

=== modified file 'mysql-test/t/sp-fib.test'
--- a/mysql-test/t/sp-fib.test	2009-06-04 11:53:15 +0000
+++ b/mysql-test/t/sp-fib.test	2009-07-03 08:23:16 +0000
@@ -22,13 +22,14 @@ begin
     begin
       declare x, y bigint unsigned;
       declare c cursor for select f from t3 order by f desc limit 2;
-
       open c;
       fetch c into y;
       fetch c into x;
-      close c;
       insert into t3 values (x+y);
       call fib(n-1);
+      ## Close the cursor AFTER the recursion to ensure that the stack
+      ## frame is somewhat intact.
+      close c;
     end;
   end if;
 end|
@@ -36,24 +37,17 @@ end|
 # Enable recursion
 set @@max_sp_recursion_depth= 20|
 
-# Minimum test: recursion of 3 levels
-
 insert into t3 values (0), (1)|
 
-call fib(3)|
+# The small number of recursion levels is intentional.
+# We need to avoid
+# Bug#15866 main.sp fails (thread stack limit
+#           insufficient for recursive call "fib(20)")
+# which affects some platforms.
+call fib(4)|
 
 select * from t3 order by f asc|
 
-truncate table t3|
-
-# The original test, 20 levels, ran into memory limits on some machines
-# and builds. Try 10 instead...
-
-insert into t3 values (0), (1)|
-
-call fib(10)|
-
-select * from t3 order by f asc|
 drop table t3|
 drop procedure fib|
 set @@max_sp_recursion_depth= 0|


--Boundary_(ID_1Ij/7Jb7nvEsszTne/s/uQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/bernt.johnsen@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/bernt.johnsen@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bernt.johnsen@stripped
# target_branch: file:///export/home/tmp/mysql/pe/
# testament_sha1: 2e07a01030727262274eede44319fe94ff0f4679
# timestamp: 2009-07-03 10:29:05 +0200
# source_branch: file:///export/home/tmp/mysql/pe-gca/
# base_revision_id: joro@stripped
# 
# Begin bundle
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


--Boundary_(ID_1Ij/7Jb7nvEsszTne/s/uQ)--