Commit 752cadd4 authored by unknown's avatar unknown
Browse files

manual merge 


mysql-test/r/events.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/event.h:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
parents f36bcd0e 8d4f74be

mysql-test/r/events.result

+186 −21
Original line number Diff line number Diff line
@@ -32,13 +32,178 @@ count(*) 
0

drop event event3;

drop table t_event3;

set names utf8;

CREATE EVENT root6 ON SCHEDULE EVERY '10:20' MINUTE_SECOND ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1;

SHOW CREATE EVENT root6;

Event	sql_mode	Create Event

root6		CREATE EVENT `events_test`.`root6` ON SCHEDULE EVERY '10:20' MINUTE_SECOND ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1

create event root7 on schedule every 2 year do select 1;

SHOW CREATE EVENT root7;

Event	sql_mode	Create Event

root7		CREATE EVENT `events_test`.`root7` ON SCHEDULE EVERY 2 YEAR ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root8 on schedule every '2:5' year_month do select 1;

SHOW CREATE EVENT root8;

Event	sql_mode	Create Event

root8		CREATE EVENT `events_test`.`root8` ON SCHEDULE EVERY '2-5' YEAR_MONTH ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root8_1 on schedule every '2:15' year_month do select 1;

SHOW CREATE EVENT root8_1;

Event	sql_mode	Create Event

root8_1		CREATE EVENT `events_test`.`root8_1` ON SCHEDULE EVERY '3-3' YEAR_MONTH ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root9 on schedule every 2 week ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' do select 1;

SHOW CREATE EVENT root9;

Event	sql_mode	Create Event

root9		CREATE EVENT `events_test`.`root9` ON SCHEDULE EVERY 2 WEEK ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' DO select 1

create event root10 on schedule every '20:5' day_hour do select 1;

SHOW CREATE EVENT root10;

Event	sql_mode	Create Event

root10		CREATE EVENT `events_test`.`root10` ON SCHEDULE EVERY '20 5' DAY_HOUR ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root11 on schedule every '20:25' day_hour do select 1;

SHOW CREATE EVENT root11;

Event	sql_mode	Create Event

root11		CREATE EVENT `events_test`.`root11` ON SCHEDULE EVERY '21 1' DAY_HOUR ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root12 on schedule every '20:25' hour_minute do select 1;

SHOW CREATE EVENT root12;

Event	sql_mode	Create Event

root12		CREATE EVENT `events_test`.`root12` ON SCHEDULE EVERY '20:25' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root13 on schedule every '25:25' hour_minute do select 1;

SHOW CREATE EVENT root13;

Event	sql_mode	Create Event

root13		CREATE EVENT `events_test`.`root13` ON SCHEDULE EVERY '25:25' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root13_1 on schedule every '11:65' hour_minute do select 1;

SHOW CREATE EVENT root13_1;

Event	sql_mode	Create Event

root13_1		CREATE EVENT `events_test`.`root13_1` ON SCHEDULE EVERY '12:5' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root14 on schedule every '35:35' minute_second do select 1;

SHOW CREATE EVENT root14;

Event	sql_mode	Create Event

root14		CREATE EVENT `events_test`.`root14` ON SCHEDULE EVERY '35:35' MINUTE_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root15 on schedule every '35:66' minute_second do select 1;

SHOW CREATE EVENT root15;

Event	sql_mode	Create Event

root15		CREATE EVENT `events_test`.`root15` ON SCHEDULE EVERY '36:6' MINUTE_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root16 on schedule every '35:56' day_minute do select 1;

SHOW CREATE EVENT root16;

Event	sql_mode	Create Event

root16		CREATE EVENT `events_test`.`root16` ON SCHEDULE EVERY '1 11:56' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root17 on schedule every '35:12:45' day_minute do select 1;

SHOW CREATE EVENT root17;

Event	sql_mode	Create Event

root17		CREATE EVENT `events_test`.`root17` ON SCHEDULE EVERY '35 12:45' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root17_1 on schedule every '35:25:65' day_minute do select 1;

SHOW CREATE EVENT root17_1;

Event	sql_mode	Create Event

root17_1		CREATE EVENT `events_test`.`root17_1` ON SCHEDULE EVERY '36 2:5' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root18 on schedule every '35:12:45' hour_second do select 1;

SHOW CREATE EVENT root18;

Event	sql_mode	Create Event

root18		CREATE EVENT `events_test`.`root18` ON SCHEDULE EVERY '35:12:45' HOUR_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root19 on schedule every '15:59:85' hour_second do select 1;

SHOW CREATE EVENT root19;

Event	sql_mode	Create Event

root19		CREATE EVENT `events_test`.`root19` ON SCHEDULE EVERY '16:0:25' HOUR_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root20 on schedule every '50:20:12:45' day_second do select 1;

SHOW CREATE EVENT root20;

Event	sql_mode	Create Event

root20		CREATE EVENT `events_test`.`root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

set names cp1251;

create event ðóóò21 on schedule every '50:23:59:95' day_second COMMENT 'òîâà å 1251 êîìåíòàð' do select 1;

SHOW CREATE EVENT ðóóò21;

Event	sql_mode	Create Event

ðóóò21		CREATE EVENT `events_test`.`ðóóò21` ON SCHEDULE EVERY '51 0:0:35' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE COMMENT 'òîâà å 1251 êîìåíòàð' DO select 1

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

show create event root22;

ERROR HY000: Microseconds intervals are not yet supported

SHOW EVENTS;

ERROR HY000: Microseconds intervals are not yet supported

drop event root22;

drop event root6;

drop event root7;

drop event root8;

drop event root8_1;

drop event root9;

drop event root10;

drop event root11;

drop event root12;

drop event root13;

drop event root13_1;

drop event root14;

drop event root15;

drop event root16;

drop event root17;

drop event root17_1;

drop event root18;

drop event root19;

drop event root20;

drop event ðóóò21;

set names latin1;

CREATE EVENT intact_check ON SCHEDULE EVERY 10 HOUR DO SELECT "nothing";

SHOW EVENTS;

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

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

ALTER TABLE mysql.event ADD dummy INT FIRST;

SHOW EVENTS;

ERROR HY000: Column count of mysql.event is wrong. Table probably corrupted. Expected 15, found 16.

ALTER TABLE mysql.event DROP dummy, ADD dummy2 VARCHAR(64) FIRST;

SHOW EVENTS;

ERROR HY000: Column count of mysql.event is wrong. Table probably corrupted. Expected 15, found 16.

ALTER TABLE mysql.event DROP dummy2;

SHOW EVENTS;

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

events_test	intact_check	root@localhost	RECURRING	NULL	10	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(20) character set utf8 collate utf8_bin default '';

SHOW CREATE TABLE mysql.event;

Table	Create Table

event	CREATE TABLE `event` (

  `db` char(20) character set utf8 collate utf8_bin NOT NULL default '',

  `name` char(64) character set utf8 collate utf8_bin NOT NULL default '',

  `body` longblob NOT NULL,

  `definer` char(77) character set utf8 collate utf8_bin NOT NULL default '',

  `execute_at` datetime default NULL,

  `interval_value` int(11) default NULL,

  `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL,

  `created` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,

  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',

  `last_executed` datetime default NULL,

  `starts` datetime default NULL,

  `ends` datetime default NULL,

  `status` enum('ENABLED','DISABLED') NOT NULL default 'ENABLED',

  `on_completion` enum('DROP','PRESERVE') NOT NULL default 'DROP',

  `comment` char(64) character set utf8 collate utf8_bin NOT NULL default '',

  PRIMARY KEY  (`definer`,`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.

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

"This should work"

SHOW EVENTS;

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

events_test	intact_check	root@localhost	RECURRING	NULL	10	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 '';

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;

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Column count of mysql.event is wrong. Table probably corrupted. Expected 15, found 13.

DROP TABLE mysql.event;

CREATE TABLE mysql.event like event_like;

INSERT INTO  mysql.event SELECT * FROM event_like;

DROP TABLE event_like;

SHOW EVENTS;

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

events_test	intact_check	root@localhost	RECURRING	NULL	10	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	INTERVAL_SECOND	#	#	ENABLED

events_test	one_event	root@localhost	RECURRING	NULL	10	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	INTERVAL_SECOND	ENABLED	NOT PRESERVE	

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

CREATE DATABASE events_test2;

CREATE USER ev_test@localhost;

GRANT ALL ON events_test.* to ev_test@localhost;
@@ -72,20 +237,20 @@ create event three_event on schedule every 20 second on completion preserve comm 
"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	INTERVAL_SECOND	#	#	ENABLED

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

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

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

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

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

"This should show us only 3 events:";

SHOW FULL EVENTS;

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

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

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

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

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

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

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

"This should show us only 2 events:";

SHOW FULL 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	INTERVAL_SECOND	#	#	ENABLED

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

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

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

"This should show us no events:";

SHOW FULL EVENTS FROM test LIKE '%';

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status
@@ -93,20 +258,20 @@ 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	INTERVAL_SECOND	#	#	ENABLED

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

"we should see 4 events now:";

SHOW FULL EVENTS;

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

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

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

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

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

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

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

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

events_test	one_event	root@localhost	RECURRING	NULL	10	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	INTERVAL_SECOND	ENABLED	NOT PRESERVE	

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

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

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

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

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

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

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

drop event one_event;

drop event two_event;

drop event three_event;

mysql-test/t/events.test

+132 −0
Original line number Diff line number Diff line
@@ -33,6 +33,138 @@ select count(*) from t_event3; 
drop event event3;

drop table t_event3;





set names utf8;

#

# SHOW CREATE EVENT test begin

#

CREATE EVENT root6 ON SCHEDULE EVERY '10:20' MINUTE_SECOND ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1;

SHOW CREATE EVENT root6;

create event root7 on schedule every 2 year do select 1;

SHOW CREATE EVENT root7;

create event root8 on schedule every '2:5' year_month do select 1;

SHOW CREATE EVENT root8;

create event root8_1 on schedule every '2:15' year_month do select 1;

SHOW CREATE EVENT root8_1;

create event root9 on schedule every 2 week ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' do select 1;

SHOW CREATE EVENT root9;

create event root10 on schedule every '20:5' day_hour do select 1;

SHOW CREATE EVENT root10;

create event root11 on schedule every '20:25' day_hour do select 1;

SHOW CREATE EVENT root11;

create event root12 on schedule every '20:25' hour_minute do select 1;

SHOW CREATE EVENT root12;

create event root13 on schedule every '25:25' hour_minute do select 1;

SHOW CREATE EVENT root13;

create event root13_1 on schedule every '11:65' hour_minute do select 1;

SHOW CREATE EVENT root13_1;

create event root14 on schedule every '35:35' minute_second do select 1;

SHOW CREATE EVENT root14;

create event root15 on schedule every '35:66' minute_second do select 1;

SHOW CREATE EVENT root15;

create event root16 on schedule every '35:56' day_minute do select 1;

SHOW CREATE EVENT root16;

create event root17 on schedule every '35:12:45' day_minute do select 1;

SHOW CREATE EVENT root17;

create event root17_1 on schedule every '35:25:65' day_minute do select 1;

SHOW CREATE EVENT root17_1;

create event root18 on schedule every '35:12:45' hour_second do select 1;

SHOW CREATE EVENT root18;

create event root19 on schedule every '15:59:85' hour_second do select 1;

SHOW CREATE EVENT root19;

create event root20 on schedule every '50:20:12:45' day_second do select 1;

SHOW CREATE EVENT root20;

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 1535

show create event root22;

--error 1535

SHOW EVENTS;

drop event root22;

drop event root6;

drop event root7;

drop event root8;

drop event root8_1;

drop event root9;

drop event root10;

drop event root11;

drop event root12;

drop event root13;

drop event root13_1;

drop event root14;

drop event root15;

drop event root16;

drop event root17;

drop event root17_1;

drop event root18;

drop event root19;

drop event root20;

drop event ðóóò21;



set names latin1;

#

# SHOW CREATE EVENT test end

#



#

# mysql.event intact checking start

#

# There should be at least 1 second between the ALTERs or we can't catch the change of create_time!!

#

CREATE EVENT intact_check ON SCHEDULE EVERY 10 HOUR DO SELECT "nothing";

--replace_column 8 # 9 #

SHOW EVENTS;

ALTER TABLE mysql.event ADD dummy INT FIRST;

--error 1525

SHOW EVENTS;

ALTER TABLE mysql.event DROP dummy, ADD dummy2 VARCHAR(64) FIRST;

--error 1525

SHOW EVENTS;

ALTER TABLE mysql.event DROP dummy2;

--replace_column 8 # 9 #

SHOW EVENTS;

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(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 '';

--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;

CREATE TABLE mysql.event like event_like;

INSERT INTO  mysql.event SELECT * FROM event_like;

DROP TABLE event_like;

--replace_column 8 # 9 #

SHOW EVENTS;

DROP EVENT intact_check;

#

# mysql.event intact checking end

#



#

#INFORMATION_SCHEMA.EVENTS test begin

#

sql/event.cc

+459 −32

File changed.

Preview size limit exceeded, changes collapsed.

sql/event.h

+14 −4
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ class event_timed 
  enum enum_event_on_completion on_completion;

  enum enum_event_status status;

  sp_head *sphead;

  ulong sql_mode;



  const uchar *body_begin;
@@ -119,8 +120,9 @@ class event_timed 
  event_timed():running(0), status_changed(false), last_executed_changed(false),

                expression(0), created(0), modified(0),

                on_completion(MYSQL_EVENT_ON_COMPLETION_DROP),

                status(MYSQL_EVENT_ENABLED), sphead(0), dropped(false),

                free_sphead_on_delete(true), flags(0)

                status(MYSQL_EVENT_ENABLED), sphead(0), sql_mode(0),

                body_begin(0), dropped(false), free_sphead_on_delete(true),

                flags(0)

                

  {

    pthread_mutex_init(&this->LOCK_running, MY_MUTEX_INIT_FAST);
@@ -177,8 +179,8 @@ class event_timed 
  bool

  update_fields(THD *thd);



  char *

  get_show_create_event(THD *thd, uint32 *length);

  int

  get_create_event(THD *thd, String *buf);

  

  int

  execute(THD *thd, MEM_ROOT *mem_root= NULL);
@@ -221,8 +223,16 @@ evex_drop_event(THD *thd, event_timed *et, bool drop_if_exists, 
int

evex_open_event_table(THD *thd, enum thr_lock_type lock_type, TABLE **table);



int

evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer);



int sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);



int

event_reconstruct_interval_expression(String *buf,

                                      interval_type interval,

                                      longlong expression);



int

init_events();

sql/event_executor.cc

+185 −4
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ extern ulong thread_created; 
extern const char *my_localhost;

extern pthread_attr_t connection_attrib;



pthread_mutex_t LOCK_event_arrays,

                LOCK_workers_count,

                LOCK_evex_running;

pthread_mutex_t LOCK_event_arrays,  // mutex for when working with the queue

                LOCK_workers_count, // mutex for when inc/dec uint workers_count

                LOCK_evex_running;  // mutes for managing bool evex_is_running





bool evex_is_running= false;
@@ -62,6 +62,19 @@ event_executor_worker(void *arg); 
pthread_handler_t

event_executor_main(void *arg);





/*

   Returns the seconds difference of 2 TIME structs



   SYNOPSIS

     evex_time_diff()

      a - TIME struct 1

      b - TIME struct 2

   

   Returns:

    the seconds difference

*/



static int

evex_time_diff(TIME *a, TIME *b)

{
@@ -69,6 +82,19 @@ evex_time_diff(TIME *a, TIME *b) 
}





/*

   Inits the mutexes used by the scheduler module



   SYNOPSIS

     evex_init_mutexes()

          

   NOTES

    The mutexes are :

      LOCK_event_arrays

      LOCK_workers_count

      LOCK_evex_running

*/



static void

evex_init_mutexes()

{
@@ -84,6 +110,75 @@ evex_init_mutexes() 
}





/*

  Opens mysql.db and mysql.user and checks whether

  1. mysql.db has column Event_priv at column 20 (0 based);

  2. mysql.user has column Event_priv at column 29 (0 based);

  

  Synopsis

    evex_check_system_tables()

*/



void

evex_check_system_tables()

{

  THD *thd= current_thd;

  TABLE_LIST tables;

  bool not_used;

  Open_tables_state backup;



  // thd is 0x0 during boot of the server. Later it's !=0x0

  if (!thd)

    return;



  thd->reset_n_backup_open_tables_state(&backup);

  

  bzero((char*) &tables, sizeof(tables));

  tables.db= (char*) "mysql";

  tables.table_name= tables.alias= (char*) "db";

  tables.lock_type= TL_READ;



  if (simple_open_n_lock_tables(thd, &tables))

    sql_print_error("Cannot open mysql.db");

  else

  {

    table_check_intact(tables.table, MYSQL_DB_FIELD_COUNT, mysql_db_table_fields,

                     &mysql_db_table_last_check,ER_EVENT_CANNOT_LOAD_FROM_TABLE);                           

    close_thread_tables(thd);

  }



  bzero((char*) &tables, sizeof(tables));

  tables.db= (char*) "mysql";

  tables.table_name= tables.alias= (char*) "user";

  tables.lock_type= TL_READ;



  if (simple_open_n_lock_tables(thd, &tables))

    sql_print_error("Cannot open mysql.db");

  else

  {

    if (tables.table->s->fields < 29 ||

      strncmp(tables.table->field[29]->field_name,

                STRING_WITH_LEN("Event_priv")))

      sql_print_error("mysql.user has no `Event_priv` column at position 29");



    close_thread_tables(thd);

  }



  thd->restore_backup_open_tables_state(&backup);

}





/*

   Inits the scheduler. Called on server start and every time the scheduler

   is started with switching the event_scheduler global variable to TRUE 



   SYNOPSIS

     init_events()

          

   NOTES

    Inits the mutexes used by the scheduler. Done at server start.

*/



int

init_events()

{
@@ -93,6 +188,8 @@ init_events() 


  DBUG_PRINT("info",("Starting events main thread"));

  

  evex_check_system_tables();



  evex_init_mutexes();



  VOID(pthread_mutex_lock(&LOCK_evex_running));
@@ -114,6 +211,16 @@ init_events() 
}





/*

   Cleans up scheduler memory. Called on server shutdown.



   SYNOPSIS

     shutdown_events()

          

   NOTES

    Destroys the mutexes.

*/



void

shutdown_events()

{
@@ -130,6 +237,22 @@ shutdown_events() 
}





/*

   Inits an scheduler thread handler, both the main and a worker



   SYNOPSIS

     init_event_thread()

       thd - the THD of the thread. Has to be allocated by the caller.

          

   NOTES

      1. The host of the thead is my_localhost

      2. thd->net is initted with NULL - no communication.

  

  Returns

     0  - OK

    -1  - Error

*/



static int

init_event_thread(THD* thd)

{
@@ -166,6 +289,22 @@ init_event_thread(THD* thd) 
  DBUG_RETURN(0);

}





/*

   The main scheduler thread. Inits the priority queue on start and

   destroys it on thread shutdown. Forks child threads for every event

   execution. Sleeps between thread forking and does not do a busy wait.



   SYNOPSIS

     event_executor_main() 

       arg - unused

          

   NOTES

      1. The host of the thead is my_localhost

      2. thd->net is initted with NULL - no communication.

  

*/



pthread_handler_t

event_executor_main(void *arg)

{
@@ -437,6 +576,15 @@ event_executor_main(void *arg) 
}





/*

   Function that executes an event in a child thread. Setups the 

   environment for the event execution and cleans after that.



   SYNOPSIS

     event_executor_worker()

       arg - the event_timed object to be processed

*/



pthread_handler_t

event_executor_worker(void *event_void)

{
@@ -562,6 +710,24 @@ event_executor_worker(void *event_void) 
}





/*

   Loads all ENABLED events from mysql.event into the prioritized

   queue. Called during scheduler main thread initialization. Compiles

   the events. Creates event_timed instances for every ENABLED event

   from mysql.event.



   SYNOPSIS

     evex_load_events_from_db()

       thd - Thread context. Used for memory allocation in some cases.

     

   RETURNS

     0  - OK

    -1  - Error

    

   NOTES

     Reports the error to the console

*/



static int

evex_load_events_from_db(THD *thd)

{
@@ -648,7 +814,22 @@ evex_load_events_from_db(THD *thd) 
}





bool sys_var_event_executor::update(THD *thd, set_var *var)

/*

   The update method of the global variable event_scheduler.

   If event_scheduler is switched from 0 to 1 then the scheduler main

   thread is started.



   SYNOPSIS

     event_executor_worker()

       thd - Thread context (unused)

       car - the new value

   

   Returns

     0 - OK (always)

*/



bool

sys_var_event_executor::update(THD *thd, set_var *var)

{

  // here start the thread if not running.

  DBUG_ENTER("sys_var_event_executor::update");