From 49bd943a4856bbad44f73b6151f419ae93412d5a Mon Sep 17 00:00:00 2001
From: unknown <andrey@lmy004.>
Date: Thu, 9 Feb 2006 23:15:47 +0100
Subject: [PATCH] from fix for bug#16414 (Events: Crash or hang if event drops
 itself) WL #1034

mysql-test/r/events.result:
  update result after pull
mysql-test/t/events.test:
  comment
---
 mysql-test/r/events.result | 4 +---
 mysql-test/t/events.test   | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/events.result b/mysql-test/r/events.result
index 6048dbd3012..b5b1b76f1a8 100644
--- a/mysql-test/r/events.result
+++ b/mysql-test/r/events.result
@@ -55,7 +55,7 @@ SHOW GRANTS;
 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 @@ set global event_scheduler=0;
 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")
diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test
index 14acdb44038..aa759d5ca6f 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
@@ -175,6 +175,7 @@ select get_lock("test_lock2_1", 20);
 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;
-- 
2.30.9