1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

event_scheduler.h, event_scheduler.cc:

Browse Source 
Rename load_event() to load_named_event(), to avoid name clash on HP-UX
This commit is contained in:
kent@mysql.com 2006-05-23 17:47:17 +02:00
parent 046e77a2e5
commit ade3de74d7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/event_scheduler.cc
View File

@ -774,7 +774,7 @@ Event_scheduler::add_event(THD *thd, Event_timed *et, bool check_existence)
}
/* We need to load the event on scheduler_root */
if (!(res= load_event(thd, et, &et_new)))
if (!(res= load_named_event(thd, et, &et_new)))
{
queue_insert_safe(&queue, (byte *) et_new);
DBUG_PRINT("info", ("Sending COND_new_work"));
@ -909,7 +909,7 @@ Event_scheduler::replace_event(THD *thd, Event_timed *et, LEX_STRING *new_schema
1. Error occured
2. If the replace is DISABLED, we don't load it into the queue.
*/
if (!(res= load_event(thd, et, &et_new)))
if (!(res= load_named_event(thd, et, &et_new)))
{
queue_insert_safe(&queue, (byte *) et_new);
DBUG_PRINT("info", ("Sending COND_new_work"));
@ -2032,7 +2032,7 @@ Event_scheduler::events_count()
the table, compiles and inserts it into the cache.
SYNOPSIS
Event_scheduler::load_event()
Event_scheduler::load_named_event()
thd THD
etn The name of the event to load and compile on scheduler's root
etn_new The loaded event
@ -2043,7 +2043,7 @@ Event_scheduler::events_count()
*/
enum Event_scheduler::enum_error_code
Event_scheduler::load_event(THD *thd, Event_timed *etn, Event_timed **etn_new)
Event_scheduler::load_named_event(THD *thd, Event_timed *etn, Event_timed **etn_new)
{
int ret= 0;
MEM_ROOT *tmp_mem_root;

2
sql/event_scheduler.h
View File

@ -152,7 +152,7 @@ private:
stop_all_running_events(THD *thd);
enum enum_error_code
load_event(THD *thd, Event_timed *etn, Event_timed **etn_new);
load_named_event(THD *thd, Event_timed *etn, Event_timed **etn_new);
int
load_events_from_db(THD *thd);