diff options
| -rw-r--r-- | mysql-test/r/events.result | 16 | ||||
| -rw-r--r-- | sql/event_executor.cc | 16 |
2 files changed, 17 insertions, 15 deletions
diff --git a/mysql-test/r/events.result b/mysql-test/r/events.result index 32c43d3c7a8..ec5bb448b04 100644 --- a/mysql-test/r/events.result +++ b/mysql-test/r/events.result @@ -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; +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 +ðóóò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; +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 every 10 hour do select get_lock("test_l 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") diff --git a/sql/event_executor.cc b/sql/event_executor.cc index 32584b3ea33..43be372e96c 100644 --- a/sql/event_executor.cc +++ b/sql/event_executor.cc @@ -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) { |