From 1f12107f00c8a6ce946dccd60e53f0de66736a1e Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 21 Feb 2006 13:43:29 +0100
Subject: [PATCH] Bug#14857 Reading dump files with single statement stored
 routines fails.Bug #14857  	Reading dump files with single statement
 stored routines fails.  - Add tests, fixed by patch for 16878

mysql-test/r/mysqldump.result:
  Update test results
mysql-test/t/mysqldump.test:
  Add tests for bug 14857
---
 mysql-test/r/mysqldump.result | 14 ++++++++++++++
 mysql-test/t/mysqldump.test   | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 46056edcd5e..01d90cb0901 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2633,3 +2633,17 @@ end	AFTER	#		root@localhost
 drop trigger tr1;
 drop trigger tr2;
 drop table t1, t2;
+/*!50003 CREATE FUNCTION `f`() RETURNS bigint(20)
+return 42 */|
+/*!50003 CREATE PROCEDURE `p`()
+select 42 */|
+show create function f;
+Function	sql_mode	Create Function
+f		CREATE FUNCTION `f`() RETURNS bigint(20)
+return 42
+show create procedure p;
+Procedure	sql_mode	Create Procedure
+p		CREATE PROCEDURE `p`()
+select 42
+drop function f;
+drop procedure p;
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index caa1ae0d837..b76c82958f2 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1066,3 +1066,21 @@ show triggers;
 drop trigger tr1;
 drop trigger tr2;
 drop table t1, t2;
+
+
+#
+# Bug#14857 Reading dump files with single statement stored routines fails.
+# fixed by patch for bug#16878
+#
+#
+DELIMITER |;
+/*!50003 CREATE FUNCTION `f`() RETURNS bigint(20)
+return 42 */|
+/*!50003 CREATE PROCEDURE `p`()
+select 42 */|
+DELIMITER ;|
+show create function f;
+show create procedure p;
+drop function f;
+drop procedure p;
+