bk commit into 5.1 tree (andrey:1.2208)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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.2208 06/03/01 04:22:05 andrey@lmy004. +1 -0
  save the modified value and compare it every time. the memory address
  is not that reliable (re #17815). Not perfect solution but will work
  till #17815 is fixed.

  sql/event_executor.cc
    1.41 06/03/01 04:21:57 andrey@lmy004. +9 -2
    save the modified value and compare it every time. the memory address
    is not that reliable (re #17815). Not perfect solution but will work
    till #17815 is fixed.

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug17494

--- 1.40/sql/event_executor.cc	2006-03-01 02:34:06 +01:00
+++ 1.41/sql/event_executor.cc	2006-03-01 04:21:57 +01:00
@@ -354,17 +354,24 @@ executor_wait_till_next_event_exec(THD *
   DBUG_PRINT("evex main thread",("unlocked LOCK_event_arrays"));
   if (t2sleep > 0)
   {
+    ulonglong modified= et->modified;
     /*
       We sleep t2sleep seconds but we check every second whether this thread
       has been killed, or there is a new candidate
     */
     while (t2sleep-- && !thd->killed && event_executor_running_global_var &&
            evex_queue_num_elements(EVEX_EQ_NAME) &&
-           (evex_queue_first_element(&EVEX_EQ_NAME, Event_timed*) == et))
+           (evex_queue_first_element(&EVEX_EQ_NAME, Event_timed*) == et &&
+            evex_queue_first_element(&EVEX_EQ_NAME, Event_timed*)->modified ==
+             modified))
     {
-      DBUG_PRINT("evex main thread",("will sleep a bit more"));
+      DBUG_PRINT("evex main thread",("will sleep a bit more."));
       my_sleep(1000000);
     }
+    DBUG_PRINT("info",("saved_modified=%llu current=%llu", modified,
+               evex_queue_num_elements(EVEX_EQ_NAME)? 
+               evex_queue_first_element(&EVEX_EQ_NAME, Event_timed*)->modified:
+               (ulonglong)~0));
   }
 
   int ret= WAIT_STATUS_READY;