Commit 1e871729 authored by unknown's avatar unknown
Browse files

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0


BitKeeper/etc/logging_ok:
  auto-union
parents 49892746 af38185d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ jcole@sarvik.tfr.cafe.ee 
jcole@tetra.spaceapes.com

jimw@mysql.com

joerg@mysql.com

joerg@trift-lap.fambruehe

jon@gigan.

jonas@mysql.com

joreland@bk-internal.mysql.com

mysql-test/r/sp.result

+12 −4
Original line number Diff line number Diff line
@@ -1404,11 +1404,10 @@ show procedure status like '%p%'| 
Db	Name	Type	Definer	Modified	Created	Security_type	Comment

drop table if exists fib|

create table fib ( f bigint unsigned not null )|

insert into fib values (1), (1)|

drop procedure if exists fib|

create procedure fib(n int unsigned)

begin

if n > 0 then

if n > 1 then

begin

declare x, y bigint unsigned;

declare c cursor for select f from fib order by f desc limit 2;
@@ -1421,9 +1420,20 @@ call fib(n-1); 
end;

end if;

end|

insert into fib values (0), (1)|

call fib(3)|

select * from fib order by f asc|

f

0

1

1

2

delete from fib|

insert into fib values (0), (1)|

call fib(20)|

select * from fib order by f asc|

f

0

1

1

2
@@ -1444,8 +1454,6 @@ f 
2584

4181

6765

10946

17711

drop table fib|

drop procedure fib|

drop procedure if exists bar|

mysql-test/t/sp.test

+15 −3
Original line number Diff line number Diff line
@@ -1634,8 +1634,6 @@ drop table if exists fib| 
--enable_warnings

create table fib ( f bigint unsigned not null )|



insert into fib values (1), (1)|



# We deliberately do it the awkward way, fetching the last two

# values from the table, in order to exercise various statements

# and table accesses at each turn.
@@ -1644,7 +1642,7 @@ drop procedure if exists fib| 
--enable_warnings

create procedure fib(n int unsigned)

begin

  if n > 0 then

  if n > 1 then

    begin

      declare x, y bigint unsigned;

      declare c cursor for select f from fib order by f desc limit 2;
@@ -1659,6 +1657,20 @@ begin 
  end if;

end|



# Minimum test: recursion of 3 levels



insert into fib values (0), (1)|



call fib(3)|



select * from fib order by f asc|



delete from fib|



# Original test: 20 levels (may run into memory limits!)



insert into fib values (0), (1)|



call fib(20)|



select * from fib order by f asc|