Commit 7c596993 authored by unknown's avatar unknown
Browse files

fix for bug #17494 (The algorithm for calculating execution times is not fully correct) 

This also should fix 17493 and 17346, and probably 16397 (not tested).
WL#1034 (Internal CRON)
(post-review commit)


mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  update test
sql/event.cc:
  seems we get a crash if we compile it this way. better let the worker thread do it,
  this increases the stability.
sql/event_executor.cc:
  kick in more often
sql/event_timed.cc:
  - don't NULLify last_executed
  - implement (fix) better get_next_time() which does not use last_executed as basis
    but STARTS. STARTS is used as basis and the next point of time which is before ENDS,
    if set, is being found. The point > now and (point-starts) % interval_expression == 0.
sql/item_timefunc.cc:
  move calc_time_diff to time.cc as it can be reused in other parts of the 
  server code (see event_timed.cc)
sql/mysql_priv.h:
  export calc_time_diff() moved to time.cc from item_timefunc.cc
sql/sql_show.cc:
  - fix presenting of LAST_EXECUTED
  - cleanup a bit
sql/time.cc:
  - move calc_time_diff() from item_timefunc.cc to here
parent e0f44ddf

mysql-test/r/events.result

+6 −5
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ drop event if exists event3; 
Warnings:

Note	1305	Event event3 does not exist

create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20151010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());

set max_allowed_packet=128000000;

select count(*) from t_event3;

count(*)

0
@@ -232,6 +231,9 @@ Db Name Definer Type Execute at Interval value Interval field Starts Ends Status 
events_test	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED

CREATE TABLE event_like LIKE mysql.event;

INSERT INTO event_like SELECT * FROM mysql.event;

ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.

ALTER TABLE mysql.event MODIFY db char(20) character set utf8 collate utf8_bin default '';

SHOW CREATE TABLE mysql.event;

Table	Create Table
@@ -261,10 +263,9 @@ ALTER TABLE mysql.event MODIFY db char(64) character set utf8 collate utf8_bin d 
SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test                                                 	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED

ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.

ALTER TABLE mysql.event MODIFY db varchar(64) character set utf8 collate utf8_bin default '';

Warnings:

Warning	1265	Data truncated for column 'db' at row 1

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.

ALTER TABLE mysql.event DROP comment, DROP starts;

mysql-test/r/events_scheduling.result

0 → 100644
+46 −0
Original line number Diff line number Diff line 
CREATE DATABASE IF NOT EXISTS events_test;

USE events_test;

CREATE TABLE table_1(a int);

CREATE TABLE table_2(a int);

CREATE TABLE table_3(a int);

CREATE TABLE table_4(a int);

SET GLOBAL event_scheduler=1;

CREATE EVENT two_sec ON SCHEDULE EVERY 2 SECOND DO INSERT INTO table_1 VALUES(1);

CREATE EVENT start_n_end

ON SCHEDULE EVERY 1 SECOND

ENDS NOW() + INTERVAL 6 SECOND

ON COMPLETION PRESERVE

DO INSERT INTO table_2 VALUES(1);

CREATE EVENT only_one_time ON SCHEDULE EVERY 2 SECOND ENDS NOW() + INTERVAL 1 SECOND DO INSERT INTO table_3 VALUES(1);

CREATE EVENT two_time ON SCHEDULE EVERY 1 SECOND ENDS NOW() + INTERVAL 1 SECOND DO INSERT INTO table_4 VALUES(1);

SELECT IF(SUM(a) >= 4, 'OK', 'ERROR') FROM table_1;

IF(SUM(a) >= 4, 'OK', 'ERROR')

OK

SELECT IF(SUM(a) >= 5, 'OK', 'ERROR') FROM table_2;

IF(SUM(a) >= 5, 'OK', 'ERROR')

OK

SELECT IF(SUM(a) >  0, 'OK', 'ERROR') FROM table_3;

IF(SUM(a) >  0, 'OK', 'ERROR')

OK

SELECT IF(SUM(a) >  0, 'OK', 'ERROR') FROM table_4;

IF(SUM(a) >  0, 'OK', 'ERROR')

OK

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;

IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR')

OK

SELECT IF(LAST_EXECUTED-ENDS < 2, '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 < 2, 'OK', 'ERROR')

OK

DROP EVENT start_n_end;

"Already dropped because ended. Therefore an error."

DROP EVENT only_one_time;

ERROR HY000: Unknown event 'only_one_time'

"Already dropped because ended. Therefore an error."

DROP EVENT two_time;

ERROR HY000: Unknown event 'two_time'

DROP TABLE table_1;

DROP TABLE table_2;

DROP TABLE table_3;

DROP TABLE table_4;

DROP DATABASE events_test;

mysql-test/t/events.test

+4 −9
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ set global event_scheduler = 0; 
create table t_event3 (a int, b float);

drop event if exists event3;

create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20151010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());

set max_allowed_packet=128000000;

select count(*) from t_event3;

drop event event3;

drop table t_event3;
@@ -202,29 +201,25 @@ CREATE TABLE event_like LIKE mysql.event; 
INSERT INTO event_like SELECT * FROM mysql.event;

#sleep a bit or we won't catch the change of time

--sleep 1

ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';

--error 1526

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ALTER TABLE mysql.event MODIFY db char(20) character set utf8 collate utf8_bin default '';

#wait a bit or we won't see the difference because of seconds resolution

--sleep 1

SHOW CREATE TABLE mysql.event;

--error 1526

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

--sleep 1

ALTER TABLE mysql.event MODIFY db char(64) character set utf8 collate utf8_bin default '';

--sleep 1

--echo "This should work"

--replace_column 8 # 9 #

SHOW EVENTS;

--sleep 1

ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';

--error 1526

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

--sleep 1

ALTER TABLE mysql.event MODIFY db varchar(64) character set utf8 collate utf8_bin default '';

--sleep 2

--error 1526

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

--sleep 1

ALTER TABLE mysql.event DROP comment, DROP starts;

--sleep 1

--error 1525

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

DROP TABLE mysql.event;

mysql-test/t/events_scheduling.test

0 → 100644
+36 −0
Original line number Diff line number Diff line 
CREATE DATABASE IF NOT EXISTS events_test;

USE events_test;

CREATE TABLE table_1(a int);

CREATE TABLE table_2(a int);

CREATE TABLE table_3(a int);

CREATE TABLE table_4(a int);

SET GLOBAL event_scheduler=1;

CREATE EVENT two_sec ON SCHEDULE EVERY 2 SECOND DO INSERT INTO table_1 VALUES(1);

CREATE EVENT start_n_end

  ON SCHEDULE EVERY 1 SECOND

  ENDS NOW() + INTERVAL 6 SECOND

  ON COMPLETION PRESERVE

  DO INSERT INTO table_2 VALUES(1);

--sleep 5

CREATE EVENT only_one_time ON SCHEDULE EVERY 2 SECOND ENDS NOW() + INTERVAL 1 SECOND DO INSERT INTO table_3 VALUES(1);

CREATE EVENT two_time ON SCHEDULE EVERY 1 SECOND ENDS NOW() + INTERVAL 1 SECOND DO INSERT INTO table_4 VALUES(1);

--sleep 5

SELECT IF(SUM(a) >= 4, 'OK', 'ERROR') FROM table_1;

SELECT IF(SUM(a) >= 5, 'OK', 'ERROR') FROM table_2;

SELECT IF(SUM(a) >  0, 'OK', 'ERROR') FROM table_3;

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 < 2, '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;

--echo "Already dropped because ended. Therefore an error."

--error 1517

DROP EVENT only_one_time;

--echo "Already dropped because ended. Therefore an error."

--error 1517

DROP EVENT two_time;

DROP TABLE table_1;

DROP TABLE table_2;

DROP TABLE table_3;

DROP TABLE table_4;

DROP DATABASE events_test;

sql/event.cc

+0 −7
Original line number Diff line number Diff line
@@ -1048,13 +1048,6 @@ evex_load_and_compile_event(THD * thd, sp_name *spn, LEX_STRING definer, 
  if (ret)

    goto done;

  

  /*

    allocate on evex_mem_root. if you call without evex_mem_root

    then sphead will not be cleared!

  */

  if ((ret= ett->compile(thd, &evex_mem_root)))

    goto done;

  

  ett->compute_next_execution_time();

  if (use_lock)

    VOID(pthread_mutex_lock(&LOCK_event_arrays));