bk commit into 5.1 tree (dkatz:1.2654) BUG#29830

[damien]

Below is the list of changes that have just been committed into a local
5.1 repository of dkatz. When dkatz 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-12-07 16:00:50-05:00, dkatz@stripped +3 -0
  Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows.
  
  Changed LAST_EXECUTED time the event execution start time, instead of the execution
completion time.

  mysql-test/t/disabled.def@stripped, 2007-12-07 16:00:44-05:00,
dkatz@stripped +0 -1
    Enable test.

  mysql-test/t/events_scheduling.test@stripped, 2007-12-07 16:00:44-05:00,
dkatz@stripped +1 -1
    LAST_EXECUTED - ENDS is always 0 or less.

  sql/event_data_objects.cc@stripped, 2007-12-07 16:00:44-05:00,
dkatz@stripped +0 -2
    Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
    
    Change LAST_EXECUTED time the execution start time, instead of the execution
completion time.

diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2007-11-25 09:55:02 -05:00
+++ b/mysql-test/t/disabled.def	2007-12-07 16:00:44 -05:00
@@ -18,7 +18,6 @@ federated_transactions   : Bug#29523 Tra
 ndb_dd_backuprestore     : Bug#32659 ndb_dd_backuprestore.test fails randomly
 binlog_multi_engine      : Bug#32663 binlog_multi_engine.test fails randomly
 events                   : Bug#32664 events.test fails randomly
-events_scheduling        : Bug#29830 Test case 'events_scheduling' fails on Mac OS X and
Windows
 lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log
 rpl_log              : Bug#32653: rpl_log.test fails randomly
 rpl_view             : Bug#32654: rpl_view.test fails randomly
diff -Nrup a/mysql-test/t/events_scheduling.test b/mysql-test/t/events_scheduling.test
--- a/mysql-test/t/events_scheduling.test	2007-05-26 10:36:32 -04:00
+++ b/mysql-test/t/events_scheduling.test	2007-12-07 16:00:44 -05:00
@@ -87,7 +87,7 @@ SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STAR
 FROM INFORMATION_SCHEMA.EVENTS
 WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2';
 
-SELECT IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR')
+SELECT IF(LAST_EXECUTED-ENDS < 0, 'OK', 'ERROR')
 FROM INFORMATION_SCHEMA.EVENTS
 WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2';
 
diff -Nrup a/sql/event_data_objects.cc b/sql/event_data_objects.cc
--- a/sql/event_data_objects.cc	2007-10-19 11:57:06 -04:00
+++ b/sql/event_data_objects.cc	2007-12-07 16:00:44 -05:00
@@ -1649,8 +1649,6 @@ err:
 void
 Event_queue_element::mark_last_executed(THD *thd)
 {
-  thd->set_current_time();
-
   last_executed= (my_time_t) thd->query_start();
   last_executed_changed= TRUE;