mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
da4734c3bc
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.
65 lines
2.4 KiB
Text
65 lines
2.4 KiB
Text
CREATE DATABASE IF NOT EXISTS events_test;
|
|
CREATE DATABASE events_conn1_test2;
|
|
CREATE TABLE events_test.fill_it1(test_name varchar(20), occur datetime);
|
|
CREATE TABLE events_test.fill_it2(test_name varchar(20), occur datetime);
|
|
CREATE TABLE events_test.fill_it3(test_name varchar(20), occur datetime);
|
|
CREATE USER event_user2@localhost;
|
|
CREATE DATABASE events_conn2_db;
|
|
GRANT ALL ON *.* TO event_user2@localhost;
|
|
CREATE USER event_user3@localhost;
|
|
CREATE DATABASE events_conn3_db;
|
|
GRANT ALL ON *.* TO event_user3@localhost;
|
|
"In the second connection we create some events which won't be dropped till the end"
|
|
"In the second connection we create some events which won't be dropped till the end"
|
|
USE events_conn1_test2;
|
|
CREATE EVENT ev_drop1 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
|
|
CREATE EVENT ev_drop2 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
|
|
CREATE EVENT ev_drop3 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
|
|
USE events_test;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS;
|
|
COUNT(*)
|
|
103
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
COUNT(*)
|
|
3
|
|
DROP DATABASE events_conn1_test2;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
COUNT(*)
|
|
0
|
|
"Now testing stability - dropping db -> events while they are running"
|
|
CREATE DATABASE events_conn1_test2;
|
|
USE events_conn1_test2;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
COUNT(*)
|
|
50
|
|
SET GLOBAL event_scheduler=on;
|
|
DROP DATABASE events_conn1_test2;
|
|
SET GLOBAL event_scheduler=off;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
COUNT(*)
|
|
0
|
|
CREATE DATABASE events_conn1_test3;
|
|
USE events_conn1_test3;
|
|
SET GLOBAL event_scheduler=on;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test3';
|
|
COUNT(*)
|
|
50
|
|
CREATE DATABASE events_conn1_test4;
|
|
USE events_conn1_test4;
|
|
CREATE DATABASE events_conn1_test2;
|
|
USE events_conn1_test2;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
COUNT(*)
|
|
50
|
|
DROP DATABASE events_conn2_db;
|
|
DROP DATABASE events_conn3_db;
|
|
DROP DATABASE events_conn1_test2;
|
|
DROP DATABASE events_conn1_test3;
|
|
SET GLOBAL event_scheduler=off;
|
|
DROP DATABASE events_conn1_test4;
|
|
SET GLOBAL event_scheduler=on;
|
|
USE events_test;
|
|
DROP TABLE fill_it1;
|
|
DROP TABLE fill_it2;
|
|
DROP TABLE fill_it3;
|
|
DROP DATABASE events_test;
|