Commit da4734c3 authored by unknown's avatar unknown
Browse files

WL#3337 (Event scheduler new architecture) 

This is a post-review patch.

Fixes the typelib implementation, available only in 5.1.11.

--event-scheduler cmdline : DISABLED | ON | OFF | 0 | 1
DISABLED - makes the scheduler unavailable during the server run
(ON|1)-  When the server is started the scheduler will be started. It can
         be stopped and restarted by setting appropriate values to
         GLOBAL event_scheduler
(OFF|0)- When the server is started, the scheduler won't be started. It
         can be started and again stopped by setting appropriate values to
         GLOBAL event_scheduler. _DEFAULT_ value

The GLOBAL variable event_scheduler can have the following values:
OFF | ON | 0 | 1
DISABLED is not possible and every attempt will end with an error that
it's not a valid value for the variable.
OFF | 0 - This is the pre-5.1.11 behavior - The scheduler stops, if not
          already stopped, and can be started again  by setting
          the value of the variable to ON|1.
ON | 1  - This is the pre-5.1.11 behavior - The scheduler starts, if not
          already started, and can be stopped again by setting the value
          of the variable to OFF|0.


mysql-test/r/events.result:
  update result
mysql-test/r/events_bugs.result:
  update result
mysql-test/r/events_logs_tests.result:
  update result
mysql-test/r/events_restart_phase1.result:
  update result
mysql-test/r/events_restart_phase3.result:
  update result
mysql-test/r/events_scheduling.result:
  update result
mysql-test/r/events_stress.result:
  update result
mysql-test/t/events.test:
  update test:
  2 -> off
  1 -> on
mysql-test/t/events_bugs.test:
  update test:
  2 -> off
  1 -> on
mysql-test/t/events_logs_tests.test:
  update test:
  2 -> off
  1 -> on
mysql-test/t/events_restart_phase1.test:
  update test:
  2 -> off
  1 -> on
mysql-test/t/events_restart_phase2-master.opt:
  update master file : 1 => on
mysql-test/t/events_scheduling.test:
  update test:
  2 -> off
  1 -> on
  
  add tests for event_scheduler global variable representation from
  SHOW VARIABLES.
mysql-test/t/events_stress.test:
  update test:
  2 -> off
  1 -> on
sql/events.cc:
  Implement two different TYPELIBs for --event-scheduler cmd line
  option and for GLOBAL variable event_scheduler
  
  --event-scheduler cmdline : DISABLED | ON | OFF | 0 | 1
  DISABLED - makes the scheduler unavailable during the server run
  (ON|1)-  When the server is started the scheduler will be started. It can
           be stopped and restarted by setting appropriate values to
           GLOBAL event_scheduler
  (OFF|0)- When the server is started, the scheduler won't be started. It
           can be started and again stopped by setting appropriate values to
           GLOBAL event_scheduler. _DEFAULT_ value
  
  The GLOBAL variable event_scheduler can have the following values:
  OFF | ON | 0 | 1
  DISABLED is not possible and every attempt will end with an error that
  it's not a valid value for the variable.
  OFF | 0 - This is the pre-5.1.11 behavior - The scheduler stops, if not
            already stopped, and can be started again  by setting
            the value of the variable to ON|1.
  ON | 1  - This is the pre-5.1.11 behavior - The scheduler starts, if not
            already started, and can be stopped again by setting the value
            of the variable to OFF|0.
sql/events.h:
  additional TYPELIB for GLOBAL event_scheduler
sql/mysqld.cc:
  --event-scheduler should be checked against a TYPELIB and
  therefore should be GET_STR, as well as we make the parameter optional.
  When not provided OFF|0 is used.
sql/set_var.cc:
  Implement typelib for event_scheduler variable.
  If allows both INT_RESULT -> 0 | 1 
  and STRING_RESULT -> OFF | ON
  The variable is shown as DISABLED | ON | OFF
sql/set_var.h:
  Implement typelib, which expects both STRING and INT,
  for event_scheduler.
parent f18ec676

mysql-test/r/events.result

+10 −8
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ db_x 
SHOW TABLES FROM db_x;

Tables_in_db_x

x_table

SET GLOBAL event_scheduler=2;

SET GLOBAL event_scheduler=off;

DROP EVENT e_x1;

DROP EVENT e_x2;

DROP DATABASE db_x;

DROP USER pauline@localhost;

USE events_test;

SET GLOBAL event_scheduler=2;

SET GLOBAL event_scheduler=off;

drop event if exists event1;

Warnings:

Note	1305	Event event1 does not exist
@@ -94,7 +94,7 @@ begin 
alter event e_43 on schedule every 5 minute;

insert into test_nested values(1);

end|

set global event_scheduler = 1;

set global event_scheduler = on;

select db, name, body, status, interval_field, interval_value from mysql.event;

db	name	body	status	interval_field	interval_value

events_test	e_43	begin
@@ -113,7 +113,7 @@ drop event non_qualif_ev; 
drop table non_qualif;

alter event non_existant rename to non_existant_too;

ERROR HY000: Unknown event 'non_existant'

set global event_scheduler = 2;

set global event_scheduler = off;

create event existant on schedule at now() + interval 1 year do select 12;

alter event non_existant rename to existant;

ERROR HY000: Event 'existant' already exists
@@ -315,12 +315,14 @@ ERROR HY000: Incorrect AT value: 'definitely not a datetime' 
set names utf8;

create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;

drop event задачка;

set event_scheduler=2;

set event_scheduler=off;

ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL

set global event_scheduler=3;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of '3'

set global event_scheduler=disabled;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'

"DISABLE the scheduler. Testing that it does not work when the variable is 0"

set global event_scheduler=2;

set global event_scheduler=off;

select definer, name, db from mysql.event;

definer	name	db

select get_lock("test_lock1", 20);
@@ -343,7 +345,7 @@ select count(*) from mysql.event; 
count(*)

0

"ENABLE the scheduler and get a lock"

set global event_scheduler=1;

set global event_scheduler=on;

select get_lock("test_lock2", 20);

get_lock("test_lock2", 20)

1
@@ -371,7 +373,7 @@ select /*3*/ user, host, db, command, state, info from information_schema.proces 
user	host	db	command	state	info

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)

set global event_scheduler=2;

set global event_scheduler=off;

"Should have only our process now:"

select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

mysql-test/r/events_bugs.result

+7 −7
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000 
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1

create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;

ERROR HY000: Incorrect STARTS value: '10000101000000'

set global event_scheduler=2;

set global event_scheduler=off;

delete from mysql.event;

set global event_scheduler= 1;

set global event_scheduler= on;

set @old_sql_mode:=@@sql_mode;

set sql_mode=ansi;

select get_lock('test_bug16407', 60);
@@ -57,7 +57,7 @@ root localhost events_test select get_lock('test_bug16407', 60) 
select release_lock('test_bug16407');

release_lock('test_bug16407')

1

set global event_scheduler= 2;

set global event_scheduler= off;

select event_schema, event_name, sql_mode from information_schema.events order by event_schema, event_name;

event_schema	event_name	sql_mode

events_test	e_16407	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
@@ -118,7 +118,7 @@ release_lock('ee_16407_2') 
select /*3*/ user, host, db, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	info

event_scheduler	localhost	NULL	NULL

set global event_scheduler= 2;

set global event_scheduler= off;

select * from events_smode_test order by ev_name, a;

ev_name	a

ee_16407_3	1980-02-19
@@ -139,7 +139,7 @@ set sql_mode='ansi'; 
select get_lock('ee_16407_5', 60);

get_lock('ee_16407_5', 60)

1

set global event_scheduler= 1;

set global event_scheduler= on;

set sql_mode='traditional';

create procedure ee_16407_5_pendant() begin insert into events_test.events_smode_test values('ee_16407_5','2001-02-29'); end|

create procedure ee_16407_6_pendant() begin insert into events_test.events_smode_test values('ee_16407_6','2004-02-29'); end|
@@ -180,10 +180,10 @@ drop event ee_16407_5; 
drop event ee_16407_6;

drop procedure ee_16407_5_pendant;

drop procedure ee_16407_6_pendant;

set global event_scheduler= 2;

set global event_scheduler= off;

drop table events_smode_test;

set sql_mode=@old_sql_mode;

set global event_scheduler=2;

set global event_scheduler=off;

delete from mysql.user where User like 'mysqltest_%';

delete from mysql.db where User like 'mysqltest_%';

flush privileges;

mysql-test/r/events_logs_tests.result

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ USER_HOST CREATE procedure select_general_log() 
BEGIN

SELECT user_host, argument FROM mysql.general_log WHERE argument LIKE '%alabala%';

END

SET GLOBAL event_scheduler=1;

SET GLOBAL event_scheduler=on;

TRUNCATE mysql.general_log;

CREATE EVENT log_general ON SCHEDULE EVERY 1 MINUTE DO SELECT 'alabala', SLEEP(1) FROM DUAL;

"Wait the scheduler to start"
@@ -25,7 +25,7 @@ USER_HOST CREATE EVENT log_general ON SCHEDULE EVERY 1 MINUTE DO SELECT 'alabala 
USER_HOST	SELECT 'alabala', SLEEP(1) FROM DUAL

DROP PROCEDURE select_general_log;

DROP EVENT log_general;

SET GLOBAL event_scheduler=2;

SET GLOBAL event_scheduler=off;

"Check slow query log"

"Save the values"

SET @old_global_long_query_time:=(select get_value());
@@ -58,12 +58,12 @@ SET SESSION long_query_time=1; 
SELECT * FROM slow_event_test;

slo_val	val

SET SESSION long_query_time=1;

SET GLOBAL event_scheduler=1;

SET GLOBAL event_scheduler=on;

CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(1.5);

"Sleep some more time than the actual event run will take"

SHOW VARIABLES LIKE 'event_scheduler';

Variable_name	Value

event_scheduler	1

event_scheduler	ON

"Check our table. Should see 1 row"

SELECT * FROM slow_event_test;

slo_val	val

mysql-test/r/events_restart_phase1.result

+3 −1
Original line number Diff line number Diff line 
create database if not exists mysqltest_events_test;

use mysqltest_events_test;

set global event_scheduler=2;

set global event_scheduler=off;

create table execution_log(name char(10));

create event abc1 on schedule every 1 second do insert into execution_log value('abc1');

create event abc2 on schedule every 1 second do insert into execution_log value('abc2');

create event abc3 on schedule every 1 second do insert into execution_log value('abc3');

select name from execution_log;

name

insert into mysql.event values ('db1','bad','select 42','root@localhost',NULL,1000,'MICROSECOND','2006-05-05 17:39:11','2006-05-05 17:39:20','2016-05-05 15:39:24','2016-05-05 15:39:11',NULL,'ENABLED','DROP','','comment1');

insert into mysql.event values ('db1','bad2','sect','root@localhost',NULL,1000,'SECOND','2006-05-05 17:39:11','2006-05-05 17:39:20','2016-05-05 15:39:24','2016-05-05 15:39:11',NULL,'ENABLED','DROP','','comment2');

"Now we restart the server"

mysql-test/r/events_restart_phase3.result

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ use mysqltest_events_test; 
"Should get 3 rows : abc1, abc2, abc3

select distinct name from execution_log order by name;

name

abc1

abc2

abc3

drop event abc1;

drop event abc2;

drop event abc3;