database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

cosmetic post-review changes

Browse Source 
mysql-test/r/events.result:
  result fixed
sql/event_executor.cc:
  cosmetic changes to show the definer of the event
This commit is contained in:
unknown
2006-02-15 21:40:38 +01:00
parent 751ca01452
commit c6e5c2bcfb
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/r/events.result
View File

@@ -129,10 +129,10 @@ SHOW CREATE EVENT root20;
Event sql_mode Create Event 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 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; set names cp1251;
create event ðóóò21 on schedule every '50:23:59:95' day_second COMMENT 'òîâà å 1251 êîìåíòàð' do select 1; create event <EFBFBD><EFBFBD><EFBFBD><EFBFBD>21 on schedule every '50:23:59:95' day_second COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> 1251 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' do select 1;
SHOW CREATE EVENT ðóóò21; SHOW CREATE EVENT <EFBFBD><EFBFBD><EFBFBD><EFBFBD>21;
Event sql_mode Create Event 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 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>21 CREATE EVENT `events_test`.`<EFBFBD><EFBFBD><EFBFBD><EFBFBD>21` ON SCHEDULE EVERY '51 0:0:35' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> 1251 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' DO select 1
insert into mysql.event (db, name, body, definer, interval_value, interval_field) values (database(), "root22", "select 1", user(), 100, "SECOND_MICROSECOND"); 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; show create event root22;
ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'
@@ -157,7 +157,7 @@ drop event root17_1;
drop event root18; drop event root18;
drop event root19; drop event root19;
drop event root20; drop event root20;
drop event ðóóò21; drop event <EFBFBD><EFBFBD><EFBFBD><EFBFBD>21;
set names latin1; set names latin1;
CREATE EVENT intact_check ON SCHEDULE EVERY 10 HOUR DO SELECT "nothing"; CREATE EVENT intact_check ON SCHEDULE EVERY 10 HOUR DO SELECT "nothing";
SHOW EVENTS; SHOW EVENTS;
@@ -354,8 +354,8 @@ create event закачка on schedule every 10 hour do select get_lock("test_l
show processlist; show processlist;
Id User Host db Command Time State Info Id User Host db Command Time State Info
# root localhost events_test Query # NULL show processlist # root localhost events_test Query # NULL show processlist
# event_scheduler NULL Connect # Sleeping NULL # event_scheduler connecting host NULL Connect # Sleeping NULL
# root events_test Connect # User lock select get_lock("test_lock2", 20) # root localhost events_test Connect # User lock select get_lock("test_lock2", 20)
"Release the mutex, the event worker should finish." "Release the mutex, the event worker should finish."
select release_lock("test_lock2"); select release_lock("test_lock2");
release_lock("test_lock2") release_lock("test_lock2")
@@ -373,8 +373,8 @@ set global event_scheduler=0;
show processlist; show processlist;
Id User Host db Command Time State Info Id User Host db Command Time State Info
# root localhost events_test Query # NULL show processlist # root localhost events_test Query # NULL show processlist
# event_scheduler NULL Connect # Sleeping NULL # event_scheduler connecting host NULL Connect # Sleeping NULL
# root events_test Connect # User lock select get_lock("test_lock2_1", 20) # 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" "Release the lock so the child process should finish. Hence the scheduler also"
select release_lock("test_lock2_1"); select release_lock("test_lock2_1");
release_lock("test_lock2_1") release_lock("test_lock2_1")

16
sql/event_executor.cc
View File

@@ -638,18 +638,20 @@ event_executor_worker(void *event_void)
{ {
int ret; int ret;
sql_print_information("SCHEDULER: Executing event %s.%s [EXPR:%d]", sql_print_information("SCHEDULER: Executing event %s.%s of %s [EXPR:%d]",
event->dbname.str, event->name.str,(int) event->expression); event->dbname.str, event->name.str,
event->definer.str, (int) event->expression);
ret= event->execute(thd, &worker_mem_root); ret= event->execute(thd, &worker_mem_root);
evex_print_warnings(thd, event); evex_print_warnings(thd, event);
sql_print_information("SCHEDULER: Executed event %s.%s [EXPR:%d]. RetCode=%d", sql_print_information("SCHEDULER: Executed event %s.%s of %s [EXPR:%d]. "
event->dbname.str, event->name.str, "RetCode=%d", event->dbname.str, event->name.str,
(int) event->expression, ret); event->definer.str, (int) event->expression, ret);
if (ret == EVEX_COMPILE_ERROR) if (ret == EVEX_COMPILE_ERROR)
sql_print_information("SCHEDULER: COMPILE ERROR for event %s.%s", sql_print_information("SCHEDULER: COMPILE ERROR for event %s.%s of",
event->dbname.str, event->name.str); event->dbname.str, event->name.str,
event->definer.str);
} }
if ((event->flags & EVENT_EXEC_NO_MORE) || event->status==MYSQL_EVENT_DISABLED) if ((event->flags & EVENT_EXEC_NO_MORE) || event->status==MYSQL_EVENT_DISABLED)
{ {