From 8430df5a07e7175d2ff2a43dd80ac8f20538887d Mon Sep 17 00:00:00 2001
From: unknown <malff@lambda.hsd1.co.comcast.net.>
Date: Wed, 23 Jan 2008 14:52:40 -0700
Subject: [PATCH] manual merge

---
 mysql-test/r/sp.result | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 22acd29a12a..f0f148814eb 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -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;
 use test;
 drop table if exists t_33618;
 drop procedure if exists proc_33618;