Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new (bdcaf4be) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/lib/init_db.sql

+1 −1

Original line number	Diff line number	Diff line
		@@ -595,7 +595,7 @@ CREATE TABLE event (
		ends DATETIME default NULL,
		status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
		on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
		comment varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
		comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
		PRIMARY KEY (db,name)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';

mysql-test/r/events.result

+9 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,15 @@ count(*)
		0
		drop event event3;
		drop table t_event3;
		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
		events_test e_26 set @a = 5 root@localhost 2017-01-01 00:00:00 DROP
		drop event e_26;
		create event e_26 on schedule at NULL disabled do set @a = 5;
		ERROR HY000: Incorrect AT value: 'NULL'
		create event e_26 on schedule at 'definitely not a datetime' disabled do set @a = 5;
		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 задачка;

mysql-test/r/system_mysql_db.result

+20 −20

Original line number	Diff line number	Diff line
		@@ -186,6 +186,26 @@ proc CREATE TABLE `proc` (
		`comment` char(64) character set utf8 collate utf8_bin NOT NULL default '',
		PRIMARY KEY (`db`,`name`,`type`)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
		show create table event;
		Table Create Table
		event CREATE TABLE `event` (
		`db` char(64) 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 (`db`,`name`)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
		show create table general_log;
		Table Create Table
		general_log CREATE TABLE `general_log` (
		@@ -211,25 +231,5 @@ slow_log CREATE TABLE `slow_log` (
		`server_id` int(11) default NULL,
		`sql_text` mediumtext NOT NULL
		) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
		show create table event;
		Table Create Table
		event CREATE TABLE `event` (
		`db` char(64) 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` varchar(64) character set utf8 collate utf8_bin NOT NULL default '',
		PRIMARY KEY (`db`,`name`)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
		show tables;
		Tables_in_test

mysql-test/t/events.test

+9 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,15 @@ select count(*) from t_event3;
		drop event event3;
		drop table t_event3;


		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;
		--error 1503
		create event e_26 on schedule at NULL disabled do set @a = 5;
		--error 1503
		create event e_26 on schedule at 'definitely not a datetime' disabled do set @a = 5;

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

scripts/mysql_create_system_tables.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -791,7 +791,7 @@ then
		c_ev="$c_ev ends DATETIME default NULL,"
		c_ev="$c_ev status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',"
		c_ev="$c_ev on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',"
		c_ev="$c_ev comment varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"
		c_ev="$c_ev comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"
		c_ev="$c_ev PRIMARY KEY (db,name)"
		c_ev="$c_ev ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';"
		fi