bk commit into 5.1 tree (msvensson:1.2134)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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.2134 06/02/21 17:15:37 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
  into  neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878

  mysql-test/t/mysqldump.test
    1.79 06/02/21 17:15:33 msvensson@neptunus.(none) +1 -1
    Merge

  mysql-test/r/mysqldump.result
    1.91 06/02/21 17:15:33 msvensson@neptunus.(none) +1 -1
    Merge

  sql/sp_head.cc
    1.201 06/02/21 17:13:25 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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/my51-bug16878/RESYNC

--- 1.200/sql/sp_head.cc	2006-02-03 19:09:53 +01:00
+++ 1.201/sql/sp_head.cc	2006-02-21 17:13:25 +01:00
@@ -1624,6 +1624,8 @@
   sublex->trg_table_fields.empty();
   sublex->sp_lex_in_use= FALSE;
 
+  sublex->in_comment= oldlex->in_comment;
+
   /* Reset type info. */
 
   sublex->charset= NULL;

--- 1.90/mysql-test/r/mysqldump.result	2006-01-13 17:44:44 +01:00
+++ 1.91/mysql-test/r/mysqldump.result	2006-02-21 17:15:33 +01:00
@@ -2650,3 +2650,39 @@
 
 DROP TRIGGER tr1;
 DROP TABLE t1;
+create table t1 (a int, created datetime);
+create table t2 (b int, created datetime);
+create trigger tr1 before insert on t1 for each row set
+new.created=now();
+create trigger tr2 after insert on t1
+for each row
+begin
+insert into t2 set b=new.a and created=new.created;
+end|
+drop trigger tr1;
+drop trigger tr2;
+drop table t1, t2;
+show triggers;
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+tr1	INSERT	t1	set
+new.created=now()	BEFORE	#		root@localhost
+tr2	INSERT	t1	begin
+insert into t2 set b=new.a and created=new.created;
+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;

--- 1.78/mysql-test/t/mysqldump.test	2005-12-02 00:14:47 +01:00
+++ 1.79/mysql-test/t/mysqldump.test	2006-02-21 17:15:33 +01:00
@@ -1048,3 +1048,51 @@
 
 DROP TRIGGER tr1;
 DROP TABLE t1;
+
+#
+# Bug #16878 dump of trigger
+#
+
+create table t1 (a int, created datetime);
+create table t2 (b int, created datetime);
+create trigger tr1 before insert on t1 for each row set
+new.created=now();
+delimiter |;
+create trigger tr2 after insert on t1
+for each row
+begin
+  insert into t2 set b=new.a and created=new.created;
+end|
+delimiter ;|
+
+# dump table and trigger
+--exec $MYSQL_DUMP test > var/tmp/bug16878.sql
+drop trigger tr1;
+drop trigger tr2;
+drop table t1, t2;
+
+# reload dump
+--exec $MYSQL test < var/tmp/bug16878.sql
+--replace_column 6 #
+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;
+