From: Date: February 27 2007 4:58pm Subject: bk commit into 5.1 tree (msvensson:1.2471) BUG#26536 List-Archive: http://lists.mysql.com/commits/20661 X-Bug: 26536 Message-Id: <200702271558.l1RFwi3V008257@pilot.blaudden> Below is the list of changes that have just been committed into a local 5.1 repository of msvensson. When msvensson 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@stripped, 2007-02-27 16:58:40+01:00, msvensson@stripped +1 -0 Bug#26536 func_time failure on vm-win2003-64-b, occurs every time - my_time_t is defined as long which means it will not always be the same size as time_t. See explanation in include/my_time.h sql/event_queue.cc@stripped, 2007-02-27 16:58:38+01:00, msvensson@stripped +0 -7 No need to require that "sizeof(time_t) == sizeof(my_time_t)" # 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: msvensson # Host: pilot.blaudden # Root: /home/msvensson/mysql/mysql-5.1-maint --- 1.23/sql/event_queue.cc 2007-01-29 00:47:29 +01:00 +++ 1.24/sql/event_queue.cc 2007-02-27 16:58:38 +01:00 @@ -153,13 +153,6 @@ Event_queue::init_queue(THD *thd, Event_ goto err; } - if (sizeof(my_time_t) != sizeof(time_t)) - { - sql_print_error("SCHEDULER: sizeof(my_time_t) != sizeof(time_t) ." - "The scheduler may not work correctly. Stopping"); - goto err; - } - res= load_events_from_db(thd); UNLOCK_QUEUE_DATA(); if (res)