manual merge

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;

use test;

drop table if exists t_33618;

drop procedure if exists proc_33618;