bk commit into 5.1 tree (andrey:1.2108)

[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.2108 06/02/15 21:40:38 andrey@lmy004. +2 -0
  cosmetic post-review changes

  sql/event_executor.cc
    1.29 06/02/15 21:40:31 andrey@lmy004. +9 -7
    cosmetic changes to show the definer of the event

  mysql-test/r/events.result
    1.17 06/02/15 21:40:31 andrey@lmy004. +8 -8
    result fixed

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

--- 1.16/mysql-test/r/events.result	2006-02-14 20:27:35 +01:00
+++ 1.17/mysql-test/r/events.result	2006-02-15 21:40:31 +01:00
@@ -129,10 +129,10 @@ SHOW CREATE EVENT root20;
 Event	sql_mode	Create Event
 root20		CREATE EVENT `events_test`.`root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1
 set names cp1251;
-create event ðóóò21 on schedule every '50:23:59:95' day_second COMMENT 'òîâà å 1251 êîìåíòàð' do select 1;
-SHOW CREATE EVENT ðóóò21;
 Event	sql_mode	Create Event
-ðóóò21		CREATE EVENT `events_test`.`ðóóò21` ON SCHEDULE EVERY '51 0:0:35' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE COMMENT 'òîâà å 1251 êîìåíòàð' DO select 1
 insert into mysql.event (db, name, body, definer, interval_value, interval_field) values (database(), "root22", "select 1", user(), 100, "SECOND_MICROSECOND");
 show create event root22;
 ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'
@@ -157,7 +157,7 @@ drop event root17_1;
 drop event root18;
 drop event root19;
 drop event root20;
-drop event ðóóò21;
 set names latin1;
 CREATE EVENT intact_check ON SCHEDULE EVERY 10 HOUR DO SELECT "nothing";
 SHOW EVENTS;
@@ -354,8 +354,8 @@ create event закачка on schedule 
 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", 20)
+#	event_scheduler	connecting host	NULL	Connect	#	Sleeping	NULL
+#	root	localhost	events_test	Connect	#	User lock	select get_lock("test_lock2", 20)
 "Release the mutex, the event worker should finish."
 select release_lock("test_lock2");
 release_lock("test_lock2")
@@ -373,8 +373,8 @@ 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)
+#	event_scheduler	connecting host	NULL	Connect	#	Sleeping	NULL
+#	root	localhost	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.28/sql/event_executor.cc	2006-02-15 12:14:15 +01:00
+++ 1.29/sql/event_executor.cc	2006-02-15 21:40:31 +01:00
@@ -638,18 +638,20 @@ event_executor_worker(void *event_void)
 
   {
     int ret;
-    sql_print_information("SCHEDULER: Executing event %s.%s [EXPR:%d]",
-               event->dbname.str, event->name.str,(int) event->expression);
+    sql_print_information("SCHEDULER: Executing event %s.%s of %s [EXPR:%d]",
+                          event->dbname.str, event->name.str,
+                          event->definer.str, (int) event->expression);
 
     ret= event->execute(thd, &worker_mem_root);
 
     evex_print_warnings(thd, event);
-    sql_print_information("SCHEDULER: Executed event %s.%s  [EXPR:%d]. RetCode=%d",
-                          event->dbname.str, event->name.str,
-                          (int) event->expression, ret);
+    sql_print_information("SCHEDULER: Executed event %s.%s of %s  [EXPR:%d]. "
+                          "RetCode=%d",  event->dbname.str, event->name.str,
+                          event->definer.str, (int) event->expression, ret);
     if (ret == EVEX_COMPILE_ERROR)
-      sql_print_information("SCHEDULER: COMPILE ERROR for event %s.%s",
-                             event->dbname.str, event->name.str);
+      sql_print_information("SCHEDULER: COMPILE ERROR for event %s.%s of",
+                            event->dbname.str, event->name.str,
+                            event->definer.str);
   }
   if ((event->flags & EVENT_EXEC_NO_MORE) || event->status==MYSQL_EVENT_DISABLED)
   {