Commit 1414ba3a authored Feb 13, 2008 by tomas@poseidon.bredbandsbolaget.se

Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge

into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge

parents 3f95d153 32853b9f

mysql-test/r/events_scheduling.result

+0 −5

Original line number	Diff line number	Diff line
		@@ -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'

mysql-test/t/events_scheduling.test

+0 −4

Original line number	Diff line number	Diff line
		@@ -87,10 +87,6 @@ SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR')
		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;