Commit 3cd05f00 authored by anozdrin/alik@ibm.'s avatar anozdrin/alik@ibm.
Browse files

Merge ibm.:/home/alik/Documents/MySQL/devel/5.0 

into  ibm.:/home/alik/Documents/MySQL/devel/5.0-rt-merged-5.0
parents f8ade5e9 025aadce

mysql-test/r/sp.result

+16 −0
Original line number Diff line number Diff line
@@ -6578,6 +6578,22 @@ DROP PROCEDURE db28318_a.t1; 
DROP PROCEDURE db28318_b.t2;

DROP DATABASE db28318_a;

DROP DATABASE db28318_b;

USE test;

DROP TABLE IF EXISTS t1;

DROP PROCEDURE IF EXISTS bug29770;

CREATE TABLE t1(a int);

CREATE PROCEDURE bug29770()

BEGIN

DECLARE CONTINUE HANDLER FOR SQLSTATE '42S22' SET @state:= 'run';

DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @exception:= 'run';

SELECT x FROM t1;

END|

CALL bug29770();

SELECT @state, @exception;

@state	@exception

run	NULL

DROP TABLE t1;

DROP PROCEDURE bug29770;

# ------------------------------------------------------------------

# -- End of 5.0 tests

# ------------------------------------------------------------------

mysql-test/t/sp.test

+24 −0
Original line number Diff line number Diff line
@@ -7698,6 +7698,30 @@ DROP PROCEDURE db28318_a.t1; 
DROP PROCEDURE db28318_b.t2;

DROP DATABASE db28318_a;

DROP DATABASE db28318_b;

USE test;



#

# Bug#29770 Two handlers are allowed to catch an error in an stored procedure.

#



--disable_warnings

DROP TABLE IF EXISTS t1;

DROP PROCEDURE IF EXISTS bug29770;

--enable_warnings



CREATE TABLE t1(a int);

delimiter |;

CREATE PROCEDURE bug29770()

BEGIN

  DECLARE CONTINUE HANDLER FOR SQLSTATE '42S22' SET @state:= 'run';

  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @exception:= 'run';

  SELECT x FROM t1;

END|

delimiter ;|

CALL bug29770();

SELECT @state, @exception;

DROP TABLE t1;

DROP PROCEDURE bug29770;





--echo # ------------------------------------------------------------------