Commit f32d0ec6 authored by unknown's avatar unknown
Browse files

Merge lmy004.:/work/mysql-5.1-new-vanilla 

into lmy004.:/work/mysql-5.1-runtime


sql/event_scheduler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents e05d55de 606abf25

mysql-test/lib/init_db.sql

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ CREATE TABLE event ( 
                        'HIGH_NOT_PRECEDENCE'

                    ) DEFAULT '' NOT NULL,

  comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  PRIMARY KEY  (definer, db, name)

  PRIMARY KEY  (db, name)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';



CREATE DATABASE IF NOT EXISTS cluster;

mysql-test/r/events.result

+1 −82
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ event CREATE TABLE `event` ( 
  `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',

  `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL DEFAULT '',

  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  PRIMARY KEY (`definer`,`db`,`name`)

  PRIMARY KEY (`db`,`name`)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.
@@ -280,84 +280,6 @@ 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

DROP EVENT intact_check;

create event one_event on schedule every 10 second do select 123;

SHOW EVENTS;

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

events_test	one_event	root@localhost	RECURRING	NULL	10	SECOND	#	#	ENABLED

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT from information_schema.events;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	root@localhost	select 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

CREATE DATABASE events_test2;

CREATE USER ev_test@localhost;

GRANT ALL ON events_test.* to ev_test@localhost;

GRANT ALL on events_test2.* to ev_test@localhost;

REVOKE EVENT ON events_test2.* FROM ev_test@localhost;

REVOKE PROCESS on *.* from ev_test@localhost;

select "NEW CONNECTION";

NEW CONNECTION

NEW CONNECTION

SELECT USER(), DATABASE();

USER()	DATABASE()

ev_test@localhost	events_test2

SHOW GRANTS;

Grants for ev_test@localhost

GRANT USAGE ON *.* TO 'ev_test'@'localhost'

GRANT ALL PRIVILEGES ON `events_test`.* TO 'ev_test'@'localhost'

GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, TRIGGER ON `events_test2`.* TO 'ev_test'@'localhost'

"Here comes an error:";

SHOW EVENTS;

ERROR 42000: Access denied for user 'ev_test'@'localhost' to database 'events_test2'

USE events_test;

"Now the list should be empty:";

SHOW EVENTS;

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

select concat("Let's create some new events from the name of ",user());

concat("Let's create some new events from the name of ",user())

Let's create some new events from the name of ev_test@localhost

create event one_event on schedule every 20 second do select 123;

create event two_event on schedule every 20 second on completion not preserve comment "two event" do select 123;

create event three_event on schedule every 20 second on completion preserve comment "three event" do select 123;

"Now we should see 3 events:";

SHOW EVENTS;

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

events_test	one_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

events_test	three_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

events_test	two_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

"This should show us only 3 events:";

SHOW EVENTS;

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

events_test	one_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

events_test	three_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

events_test	two_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

"This should show us only 2 events:";

SHOW EVENTS LIKE 't%event';

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

events_test	three_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

events_test	two_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

"This should show us no events:";

SHOW EVENTS FROM test LIKE '%';

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

DROP DATABASE events_test2;

"should see 1 event:";

SHOW EVENTS;

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

events_test	one_event	root@localhost	RECURRING	NULL	10	SECOND	#	#	ENABLED

"we should see 4 events now:";

SHOW EVENTS;

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

events_test	one_event	root@localhost	RECURRING	NULL	10	SECOND	#	#	ENABLED

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT from information_schema.events;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	ev_test@localhost	select 123	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	

NULL	events_test	three_event	ev_test@localhost	select 123	RECURRING	NULL	20	SECOND	ENABLED	PRESERVE	three event

NULL	events_test	two_event	ev_test@localhost	select 123	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	two event

NULL	events_test	one_event	root@localhost	select 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

drop event one_event;

drop event two_event;

drop event three_event;

drop user ev_test@localhost;

drop event one_event;

"Sleep a bit so the server closes the second connection"

create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;

select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;

db	name	body	definer	convert_tz(execute_at, 'UTC', 'SYSTEM')	on_completion
@@ -452,9 +374,6 @@ select 2; 
select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_body

events_test	white_space	root@localhost	select 2

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_body

events_test	white_space	root@localhost	select 2

drop event white_space;

create event white_space on schedule every 10 hour disable do	select 3;

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

mysql-test/r/events_grant.result

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

use events_test;

CREATE EVENT one_event ON SCHEDULE EVERY 10 SECOND DO SELECT 123;

SHOW EVENTS;

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

events_test	one_event	root@localhost	RECURRING	NULL	10	SECOND	#	#	ENABLED

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT from information_schema.events;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	root@localhost	SELECT 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

CREATE DATABASE events_test2;

CREATE USER ev_test@localhost;

GRANT ALL ON events_test.* to ev_test@localhost;

GRANT ALL ON events_test2.* to ev_test@localhost;

REVOKE EVENT ON events_test2.* FROM ev_test@localhost;

select "NEW CONNECTION";

NEW CONNECTION

NEW CONNECTION

SELECT USER(), DATABASE();

USER()	DATABASE()

ev_test@localhost	events_test2

SHOW GRANTS;

Grants for ev_test@localhost

GRANT USAGE ON *.* TO 'ev_test'@'localhost'

GRANT ALL PRIVILEGES ON `events_test`.* TO 'ev_test'@'localhost'

GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, TRIGGER ON `events_test2`.* TO 'ev_test'@'localhost'

"Here comes an error:";

SHOW EVENTS;

ERROR 42000: Access denied for user 'ev_test'@'localhost' to database 'events_test2'

USE events_test;

"We should see one event";

SHOW EVENTS;

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

events_test	one_event	root@localhost	RECURRING	NULL	10	SECOND	#	#	ENABLED

SELECT CONCAT("Let's create some new events from the name of ", USER());

CONCAT("Let's create some new events from the name of ", USER())

Let's create some new events from the name of ev_test@localhost

CREATE EVENT one_event ON SCHEDULE EVERY 20 SECOND DO SELECT 123;

ERROR HY000: Event 'one_event' already exists

CREATE EVENT two_event ON SCHEDULE EVERY 20 SECOND ON COMPLETION NOT PRESERVE COMMENT "two event" DO SELECT 123;

CREATE EVENT three_event ON SCHEDULE EVERY 20 SECOND ON COMPLETION PRESERVE COMMENT "three event" DO SELECT 123;

"Now we should see 3 events:";

SHOW EVENTS;

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

events_test	one_event	root@localhost	RECURRING	NULL	10	SECOND	#	#	ENABLED

events_test	three_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

events_test	two_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

"This should show us only 2 events:";

SHOW EVENTS LIKE 't%event';

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

events_test	three_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

events_test	two_event	ev_test@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

"This should show us no events:";

SHOW EVENTS FROM test LIKE '%';

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

GRANT EVENT ON events_test2.* TO ev_test@localhost;

USE events_test2;

CREATE EVENT four_event ON SCHEDULE EVERY 20 SECOND DO SELECT 42;

USE events_test;

"We should see 4 events : one_event, two_event, three_event & four_event"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	root@localhost	SELECT 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

NULL	events_test	two_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	two event

NULL	events_test	three_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	PRESERVE	three event

NULL	events_test2	four_event	ev_test@localhost	SELECT 42	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	

DROP DATABASE events_test2;

"We should see 3 events : one_event, two_event, three_event"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	root@localhost	SELECT 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

NULL	events_test	two_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	two event

NULL	events_test	three_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	PRESERVE	three event

CREATE DATABASE events_test2;

USE events_test2;

CREATE EVENT five_event ON SCHEDULE EVERY 20 SECOND DO SELECT 42;

"Should see 4 events - one, two, three & five"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	root@localhost	SELECT 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

NULL	events_test	two_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	two event

NULL	events_test	three_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	PRESERVE	three event

NULL	events_test2	five_event	root@localhost	SELECT 42	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	

REVOKE EVENT ON events_test2.* FROM ev_test@localhost;

USE test;

"Should see 3 events - one, two & three"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	root@localhost	SELECT 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

NULL	events_test	two_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	two event

NULL	events_test	three_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	PRESERVE	three event

"Let's test ALTER EVENT which changes the definer"

USE events_test;

ALTER EVENT one_event ON SCHEDULE EVERY 10 SECOND;

"The definer should be ev_test@localhost"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_NAME='one_event';

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	ev_test@localhost	SELECT 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	

USE events_test;

ALTER EVENT one_event COMMENT "comment";

"The definer should be root@localhost"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_NAME='one_event';

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	root@localhost	SELECT 123	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	comment

ALTER EVENT one_event DO SELECT 12;

"The definer should be ev_test@localhost"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_NAME='one_event';

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	one_event	ev_test@localhost	SELECT 12	RECURRING	NULL	10	SECOND	ENABLED	NOT PRESERVE	comment

"make the definer again root@localhost"

ALTER EVENT one_event COMMENT "new comment";

"test DROP by another user"

DROP EVENT one_event;

"One event should not be there"

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS;

EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT

NULL	events_test	two_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	two event

NULL	events_test	three_event	ev_test@localhost	SELECT 123	RECURRING	NULL	20	SECOND	ENABLED	PRESERVE	three event

NULL	events_test2	five_event	root@localhost	SELECT 42	RECURRING	NULL	20	SECOND	ENABLED	NOT PRESERVE	

DROP USER ev_test@localhost;

DROP DATABASE events_test2;

DROP DATABASE events_test;

mysql-test/r/system_mysql_db.result

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ event CREATE TABLE `event` ( 
  `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',

  `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL DEFAULT '',

  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  PRIMARY KEY (`definer`,`db`,`name`)

  PRIMARY KEY (`db`,`name`)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'

show create table general_log;

Table	Create Table

mysql-test/t/events.test

+3 −80
Original line number Diff line number Diff line
@@ -148,9 +148,9 @@ set names cp1251; 
create event ðóóò21 on schedule every '50:23:59:95' day_second COMMENT 'òîâà å 1251 êîìåíòàð' do select 1;

SHOW CREATE EVENT ðóóò21;

insert into mysql.event (db, name, body, definer, interval_value, interval_field) values (database(), "root22", "select 1", user(), 100, "SECOND_MICROSECOND");

--error 1235

--error ER_NOT_SUPPORTED_YET

show create event root22;

--error 1235

--error ER_NOT_SUPPORTED_YET

SHOW EVENTS;

drop event root22;

drop event root6;
@@ -239,82 +239,6 @@ DROP EVENT intact_check; 
# mysql.event intact checking end

#



#

#INFORMATION_SCHEMA.EVENTS test begin

#

create event one_event on schedule every 10 second do select 123;

--replace_column 8 # 9 #

SHOW EVENTS;

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT from information_schema.events;

CREATE DATABASE events_test2;

CREATE USER ev_test@localhost;

GRANT ALL ON events_test.* to ev_test@localhost;

GRANT ALL on events_test2.* to ev_test@localhost;

REVOKE EVENT ON events_test2.* FROM ev_test@localhost;

REVOKE PROCESS on *.* from ev_test@localhost;

#now we are on con1

connect (ev_con1,localhost,ev_test,,events_test2);

select "NEW CONNECTION";

SELECT USER(), DATABASE();

SHOW GRANTS;



--echo "Here comes an error:";

#NO EVENT_ACL on events_test2

--error 1044

SHOW EVENTS;

USE events_test;



--echo "Now the list should be empty:";

--replace_column 8 # 9 #

SHOW EVENTS;

#now create an event with the same name but we are different user

select concat("Let's create some new events from the name of ",user());

create event one_event on schedule every 20 second do select 123;

create event two_event on schedule every 20 second on completion not preserve comment "two event" do select 123;

create event three_event on schedule every 20 second on completion preserve comment "three event" do select 123;



--echo "Now we should see 3 events:";

--replace_column 8 # 9 #

SHOW EVENTS;



--echo "This should show us only 3 events:";

--replace_column 8 # 9 #

SHOW EVENTS;



--echo "This should show us only 2 events:";

--replace_column 8 # 9 #

SHOW EVENTS LIKE 't%event';



--echo "This should show us no events:";

--replace_column 8 # 9 #

SHOW EVENTS FROM test LIKE '%';

#ok, we are back

connection default;

DROP DATABASE events_test2;



--echo "should see 1 event:";

--replace_column 8 # 9 #

SHOW EVENTS;



--echo "we should see 4 events now:";

--replace_column 8 # 9 #

SHOW EVENTS;

SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT from information_schema.events;



connection ev_con1;

drop event one_event;

drop event two_event;

drop event three_event;

disconnect ev_con1;

connection default;

drop user ev_test@localhost;

drop event one_event;

#

##INFORMATION_SCHEMA.EVENTS test end

#



--echo "Sleep a bit so the server closes the second connection"

--sleep 2

create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;

select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;

drop event e_26;
@@ -358,7 +282,7 @@ select get_lock("test_lock2", 20); 
--echo "Create an event which tries to acquire a mutex. The event locks on the mutex"

create event закачка on schedule every 10 hour do select get_lock("test_lock2", 20);

--echo "Let some time pass to the event starts"

--sleep 2

--sleep 1

--echo "Should have only 2 processes: the scheduler and the locked event"

select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;--echo "Release the mutex, the event worker should finish."

--echo "Release the mutex, the event worker should finish."
@@ -409,7 +333,6 @@ create event white_space on schedule every 10 hour disable do 


select 2;

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

drop event white_space;

create event white_space on schedule every 10 hour disable do	select 3;

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';