Commit 4cf24a51 authored by unknown's avatar unknown
Browse files

event_scheduler.h, event_scheduler.cc: 

  Rename load_event() to load_named_event(), to avoid name clash on HP-UX


sql/event_scheduler.cc:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
sql/event_scheduler.h:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
parent c2330977

sql/event_scheduler.cc

+4 −4
Original line number Diff line number Diff line
@@ -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;

sql/event_scheduler.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ class Event_scheduler 
  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);