bk commit into 5.1 tree (kent:1.2184)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2184 06/05/23 17:47:17 kent@stripped +2 -0
  event_scheduler.h, event_scheduler.cc:
    Rename load_event() to load_named_event(), to avoid name clash on HP-UX

  sql/event_scheduler.h
    1.4 06/05/23 17:46:28 kent@stripped +1 -1
    Rename load_event() to load_named_event(), to avoid name clash on HP-UX

  sql/event_scheduler.cc
    1.4 06/05/23 17:46:28 kent@stripped +4 -4
    Rename load_event() to load_named_event(), to avoid name clash on HP-UX

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-564072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.3/sql/event_scheduler.cc	2006-05-23 16:49:54 +02:00
+++ 1.4/sql/event_scheduler.cc	2006-05-23 17:46:28 +02:00
@@ -774,7 +774,7 @@
   }
 
   /* 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 @@
     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 @@
   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 @@
 */
 
 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;

--- 1.3/sql/event_scheduler.h	2006-05-23 13:32:12 +02:00
+++ 1.4/sql/event_scheduler.h	2006-05-23 17:46:28 +02:00
@@ -152,7 +152,7 @@
   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);