From 8ca78787a54f5d86f23147ca734e8e167a56b7b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Jun 2006 14:22:14 +0200 Subject: WL#3337 (Events new architecture) Cut number 6. Move code from sql_show.cc to event_db_repository.cc that more belongs to the latter. sql/event_db_repository.cc: move code that works with mysql.event from sql_show.cc to event_db_repository.cc . Route through Event_db_repository's interface which is proxied by class Events. The code relies on a function from sql_show.cc which does the actual storage in the schema table. I think it's better to leave the function there because the structure of I_S.EVENTS is defined in sql_show.cc sql/event_db_repository.h: I_S / SHOW EVENTS handling hooks sql/event_scheduler.cc: use the pointer to db_repository which Event_scheduler already has sql/events.cc: Put a comment to get_instance sql/events.h: callback for I_S (sql_show.cc) sql/sql_show.cc: move code that belongs more to Event_db_repository than to here. Use a callback of class Events. Only 1 function is left here, because it copies data into the actual rows of I_S.EVENTS and belongs to this file. sql/sql_show.h: export this function will be called from event_db_repository.cc --- sql/event_scheduler.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/event_scheduler.cc') diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index 60c9cda0a56..cb500de53b9 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -2159,7 +2159,7 @@ Event_scheduler::load_events_from_db(THD *thd) DBUG_RETURN(EVEX_GENERAL_ERROR); } - if ((ret= Events::get_instance()->open_event_table(thd, TL_READ, &table))) + if ((ret= db_repository->open_event_table(thd, TL_READ, &table))) { sql_print_error("SCHEDULER: Table mysql.event is damaged. Can not open."); DBUG_RETURN(EVEX_OPEN_TABLE_FAILED); -- cgit v1.2.1