bk commit into 5.1 tree (andrey:1.2190) BUG#16408

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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.2190 06/03/16 10:34:29 andrey@lmy004. +2 -0
  fix for bug#16408, add more statements to the test

  mysql-test/t/events_bugs.test
    1.3 06/03/16 10:34:22 andrey@lmy004. +6 -2
    change error number, make the test case better

  mysql-test/r/events_bugs.result
    1.4 06/03/16 10:34:22 andrey@lmy004. +4 -0
    update the result

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug16408

--- 1.3/mysql-test/r/events_bugs.result	2006-03-15 17:45:49 +01:00
+++ 1.4/mysql-test/r/events_bugs.result	2006-03-16 10:34:22 +01:00
@@ -8,6 +8,10 @@ call p_16();
 ERROR HY000: Event 'e_16' already exists
 call p_16();
 ERROR HY000: Event 'e_16' already exists
+DROP EVENT e_16;
+CALL p_16();
+CALL p_16();
+ERROR HY000: Event 'e_16' already exists
 DROP PROCEDURE p_16;
 DROP EVENT e_16;
 set global event_scheduler=0;

--- 1.2/mysql-test/t/events_bugs.test	2006-03-15 17:45:49 +01:00
+++ 1.3/mysql-test/t/events_bugs.test	2006-03-16 10:34:22 +01:00
@@ -7,10 +7,14 @@ set @a=3;
 CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;
 call p_16();
 --echo "Here we used to crash!"
---error 1515
+--error 1516
 call p_16();
---error 1515
+--error 1516
 call p_16();
+DROP EVENT e_16;
+CALL p_16();
+--error 1516
+CALL p_16();
 DROP PROCEDURE p_16;
 DROP EVENT e_16;
 #