bk commit into 5.1 tree (mkindahl:1.2551)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl 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, 2008-02-13 12:41:54+01:00, mkindahl@stripped +2 -0
  Removing non-deterministic tests from events_scheduling test.

  mysql-test/r/events_scheduling.result@stripped, 2008-02-13 12:41:40+01:00, mkindahl@stripped +0 -5
    Result change.

  mysql-test/t/events_scheduling.test@stripped, 2008-02-13 12:41:45+01:00, mkindahl@stripped +0 -4
    Removing a test that only confirms that event scheduling is
    inexact, hence causing sporadic failures on loaded machines.

diff -Nrup a/mysql-test/r/events_scheduling.result b/mysql-test/r/events_scheduling.result
--- a/mysql-test/r/events_scheduling.result	2007-12-08 01:27:36 +01:00
+++ b/mysql-test/r/events_scheduling.result	2008-02-13 12:41:40 +01:00
@@ -78,11 +78,6 @@ 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 <= 0, 'OK', 'ERROR')
-FROM INFORMATION_SCHEMA.EVENTS
-WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2';
-IF(LAST_EXECUTED-ENDS <= 0, 'OK', 'ERROR')
-OK
 "Already dropped because ended. Therefore an error."
 DROP EVENT event_3;
 ERROR HY000: Unknown event 'event_3'
diff -Nrup a/mysql-test/t/events_scheduling.test b/mysql-test/t/events_scheduling.test
--- a/mysql-test/t/events_scheduling.test	2007-12-08 01:27:36 +01:00
+++ b/mysql-test/t/events_scheduling.test	2008-02-13 12:41:45 +01:00
@@ -87,10 +87,6 @@ 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 <= 0, 'OK', 'ERROR')
-FROM INFORMATION_SCHEMA.EVENTS
-WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2';
-
 --echo "Already dropped because ended. Therefore an error."
 --error ER_EVENT_DOES_NOT_EXIST
 DROP EVENT event_3;