bk commit into 5.1 tree (andrey:1.2101) BUG#16414

[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.2101 06/02/09 22:44:06 andrey@lmy004. +2 -0
  from fix for bug#16414 (Events: Crash or hang if event drops itself)
  WL #1034 

  mysql-test/t/events.test
    1.14 06/02/09 22:43:58 andrey@lmy004. +1 -0
    comment

  mysql-test/r/events.result
    1.13 06/02/09 22:43:58 andrey@lmy004. +1 -3
    update result after pull

# 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-events_i_s

--- 1.12/mysql-test/r/events.result	2006-02-07 19:28:24 +01:00
+++ 1.13/mysql-test/r/events.result	2006-02-09 22:43:58 +01:00
@@ -55,7 +55,7 @@
 Grants for ev_test@localhost
 GRANT USAGE ON *.* TO 'ev_test'@'localhost'
 GRANT ALL PRIVILEGES ON `events_test`.* TO 'ev_test'@'localhost'
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `events_test2`.* TO 'ev_test'@'localhost'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, TRIGGER ON `events_test2`.* TO 'ev_test'@'localhost'
 "Here comes an error:";
 SHOW EVENTS;
 ERROR 42000: Access denied for user 'ev_test'@'localhost' to database 'events_test2'
@@ -184,8 +184,6 @@
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
 #	root	localhost	events_test	Query	#	NULL	show processlist
-#	event_scheduler		NULL	Connect	#	Sleeping	NULL
-#	root		events_test	Connect	#	User lock	select get_lock("test_lock2_1", 20)
 "Release the lock so the child process should finish. Hence the scheduler also"
 select release_lock("test_lock2_1");
 release_lock("test_lock2_1")

--- 1.13/mysql-test/t/events.test	2006-02-07 19:28:24 +01:00
+++ 1.14/mysql-test/t/events.test	2006-02-09 22:43:58 +01:00
@@ -175,6 +175,7 @@
 create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);
 --sleep 1
 --echo "Should see 2 processes, one locked on get_lock("
+#--replace_column 1 # 6 #
 #show processlist;
 --echo "Shutting down the scheduler, it should wait for the running event"
 set global event_scheduler=0;