bk commit into 5.0 tree (msvensson:1.2021) BUG#14857

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2021 06/02/21 13:43:29 msvensson@neptunus.(none) +2 -0
  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/t/mysqldump.test
    1.79 06/02/21 13:43:23 msvensson@neptunus.(none) +18 -0
    Add tests for bug 14857

  mysql-test/r/mysqldump.result
    1.89 06/02/21 13:43:23 msvensson@neptunus.(none) +14 -0
    Update test results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug16878/my50-bug16878

--- 1.88/mysql-test/r/mysqldump.result	2006-02-09 11:05:19 +01:00
+++ 1.89/mysql-test/r/mysqldump.result	2006-02-21 13:43:23 +01:00
@@ -2633,3 +2633,17 @@
 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;

--- 1.78/mysql-test/t/mysqldump.test	2006-02-09 11:05:19 +01:00
+++ 1.79/mysql-test/t/mysqldump.test	2006-02-21 13:43:23 +01:00
@@ -1066,3 +1066,21 @@
 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;
+