bk commit into 5.1 tree (dkatz:1.2678) 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 19:27:45-05:00, dkatz@stripped +4 -0
  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. This ensures the END time always the same or later than the LAST_EXECUTED time.

  mysql-test/r/events_scheduling.result@stripped, 2007-12-07 19:27:36-05:00,
dkatz@stripped +2 -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. This ensures the END time always the same or later than the
LAST_EXECUTED time.

  mysql-test/t/disabled.def@stripped, 2007-12-07 19:27:36-05:00,
dkatz@stripped +0 -1
    Enable events_scheduling test

  mysql-test/t/events_scheduling.test@stripped, 2007-12-07 19:27:36-05:00,
dkatz@stripped +1 -1
    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. This ensures the END time always the same or later than the
LAST_EXECUTED time.

  sql/event_data_objects.cc@stripped, 2007-12-07 19:27:36-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. This ensures the END time always the same or later than the
LAST_EXECUTED time.

diff -Nrup a/mysql-test/r/events_scheduling.result b/mysql-test/r/events_scheduling.result
--- a/mysql-test/r/events_scheduling.result	2007-04-05 12:47:18 -04:00
+++ b/mysql-test/r/events_scheduling.result	2007-12-07 19:27:36 -05:00
@@ -78,10 +78,10 @@ FROM INFORMATION_SCHEMA.EVENTS
 WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2';
 IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR')
 OK
-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';
-IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR')
+IF(LAST_EXECUTED-ENDS <= 0, 'OK', 'ERROR')
 OK
 "Already dropped because ended. Therefore an error."
 DROP EVENT event_3;
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2007-11-28 05:06:39 -05:00
+++ b/mysql-test/t/disabled.def	2007-12-07 19:27:36 -05:00
@@ -16,7 +16,6 @@ ctype_big5               : BUG#26711 200
 
 federated_transactions   : Bug#29523 Transactions do not work
 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
 kill                 : Bug#29149: Test "kill" fails on Windows
 grant3               : Bug#32723: grant3.test fails
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 19:27:36 -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 19:27:36 -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;