From cc1fd3db10aef91ffda890674521667dda1e6089 Mon Sep 17 00:00:00 2001
From: "cbell/Chuck@mysql_cab_desk." <>
Date: Fri, 30 Mar 2007 12:25:39 -0400
Subject: [PATCH] This patch adds IF EXISTS to the drop of start_n_end to avoid
 a problem on some build machines during testing.

---
 mysql-test/r/events_scheduling.result | 2 +-
 mysql-test/t/events_scheduling.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/events_scheduling.result b/mysql-test/r/events_scheduling.result
index d885dc3a048..12f270748a6 100644
--- a/mysql-test/r/events_scheduling.result
+++ b/mysql-test/r/events_scheduling.result
@@ -69,7 +69,7 @@ OK
 SELECT IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL;
 IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR')
 OK
-DROP EVENT start_n_end;
+DROP EVENT IF EXISTS events_test.start_n_end;
 "Already dropped because ended. Therefore an error."
 DROP EVENT only_one_time;
 ERROR HY000: Unknown event 'only_one_time'
diff --git a/mysql-test/t/events_scheduling.test b/mysql-test/t/events_scheduling.test
index e3b55685e65..f7d4c3c14d6 100644
--- a/mysql-test/t/events_scheduling.test
+++ b/mysql-test/t/events_scheduling.test
@@ -51,7 +51,7 @@ SELECT IF(SUM(a) >  0, 'OK', 'ERROR') FROM table_4;
 DROP EVENT two_sec;
 SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL;
 SELECT IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL;
-DROP EVENT start_n_end;
+DROP EVENT IF EXISTS events_test.start_n_end;
 --echo "Already dropped because ended. Therefore an error."
 --error ER_EVENT_DOES_NOT_EXIST
 DROP EVENT only_one_time;