Merge mysql.com:/extern/mysql/bk/mysql-5.0

into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0


mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.

1 files changed, 61 insertions, 21 deletions

diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index b5751c6da63..68ce9cdb118 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -4364,8 +4364,6 @@ drop procedure if exists bug7049_1|
 drop procedure if exists bug7049_2|
 drop procedure if exists bug7049_3|
 drop procedure if exists bug7049_4|
-drop procedure if exists bug7049_5|
-drop procedure if exists bug7049_6|
 drop function if exists bug7049_1|
 drop function if exists bug7049_2|
 --enable_warnings
@@ -4399,22 +4397,6 @@ begin
   select 'Missed it' as 'Result';
 end|
 
-create procedure bug7049_5()
-begin
-  declare x decimal(2,1);
-
-  set x = 'zap';
-end|
-
-create procedure bug7049_6()
-begin
-  declare exit handler for sqlwarning
-    select 'Caught it' as 'Result';
-
-  call bug7049_5();
-  select 'Missed it' as 'Result';
-end|
-
 create function bug7049_1()
   returns int
 begin
@@ -4439,7 +4421,6 @@ select * from t3|
 delete from t3|
 call bug7049_4()|
 select * from t3|
-call bug7049_6()|
 select bug7049_2()|
 
 drop table t3|
@@ -4447,8 +4428,6 @@ drop procedure bug7049_1|
 drop procedure bug7049_2|
 drop procedure bug7049_3|
 drop procedure bug7049_4|
-drop procedure bug7049_5|
-drop procedure bug7049_6|
 drop function bug7049_1|
 drop function bug7049_2|
 
@@ -5243,6 +5222,67 @@ drop procedure bug14498_4|
 drop procedure bug14498_5|
 
 #
+# BUG#15231: Stored procedure bug with not found condition handler
+#
+--disable_warnings
+drop table if exists t3|
+drop procedure if exists bug15231_1|
+drop procedure if exists bug15231_2|
+drop procedure if exists bug15231_3|
+drop procedure if exists bug15231_4|
+--enable_warnings
+
+create table t3 (id int not null)|
+  
+create procedure bug15231_1()
+begin
+  declare xid integer;
+  declare xdone integer default 0;
+  declare continue handler for not found set xdone = 1;
+
+  set xid=null;
+  call bug15231_2(xid);
+  select xid, xdone;
+end|
+
+create procedure bug15231_2(inout ioid integer)
+begin
+  select "Before NOT FOUND condition is triggered" as '1';
+  select id into ioid from t3 where id=ioid;
+  select "After NOT FOUND condtition is triggered" as '2';
+
+  if ioid is null then
+    set ioid=1;
+  end if;
+end|
+
+create procedure bug15231_3()
+begin
+  declare exit handler for sqlwarning
+    select 'Caught it (wrong)' as 'Result';
+
+  call bug15231_4();
+end|
+
+create procedure bug15231_4()
+begin
+  declare x decimal(2,1);
+
+  set x = 'zap';
+  select 'Missed it (correct)' as 'Result';
+end|
+
+call bug15231_1()|
+call bug15231_3()|
+
+drop table if exists t3|
+drop procedure if exists bug15231_1|
+drop procedure if exists bug15231_2|
+drop procedure if exists bug15231_3|
+drop procedure if exists bug15231_4|
+
+
+#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings