Skip to content

M
mariadb
Commit a820fa4f authored by unknown's avatar unknown
Browse files
Options

WL #1034 update 

- varchar -> char
- transient_expression -> interval_value
- interval_type -> interval_field


mysql-test/lib/init_db.sql:
  - varchar -> char
  - transient_expression -> interval_value
  - interval_type -> interval_field
scripts/mysql_fix_privilege_tables.sql:
  - varchar -> char
  - transient_expression -> interval_value
  - interval_type -> interval_field
sql/event.h:
  - varchar -> char
  - transient_expression -> interval_value
  - interval_type -> interval_field
parent 7634f7d6
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 40 deletions
mysql-test/lib/init_db.sql
View file @ a820fa4f
...@@ -571,13 +571,13 @@ CREATE TABLE proc ( ...@@ -571,13 +571,13 @@ CREATE TABLE proc (
CREATE TABLE event ( CREATE TABLE event (
db VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
name VARCHAR(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, body longblob NOT NULL,
definer VARCHAR(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
execute_at DATETIME default NULL, execute_at DATETIME default NULL,
transient_expression int(11) default NULL, interval_value int(11) default NULL,
interval_type ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK', interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK',
'SECOND','MICROSECOND', 'YEAR_MONTH','DAY_HOUR', 'SECOND','MICROSECOND', 'YEAR_MONTH','DAY_HOUR',
'DAY_MINUTE','DAY_SECOND', 'DAY_MINUTE','DAY_SECOND',
'HOUR_MINUTE','HOUR_SECOND', 'HOUR_MINUTE','HOUR_SECOND',
...@@ -592,5 +592,5 @@ CREATE TABLE event ( ...@@ -592,5 +592,5 @@ CREATE TABLE event (
status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED', status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
comment varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', comment varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
PRIMARY KEY (db, name) PRIMARY KEY (db,name)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events'; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
scripts/mysql_fix_privilege_tables.sql
View file @ a820fa4f
...@@ -533,28 +533,28 @@ ALTER TABLE proc MODIFY db ...@@ -533,28 +533,28 @@ ALTER TABLE proc MODIFY db
CREATE TABLE event ( CREATE TABLE event (
'db' VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
'name' VARCHAR(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, body longblob NOT NULL,
'definer' VARCHAR(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
'execute_at' DATETIME default NULL, execute_at DATETIME default NULL,
'transient_expression' int(11) default NULL, interval_value int(11) default NULL,
'interval_type' ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK', interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK',
'SECOND','MICROSECOND', 'YEAR_MONTH','DAY_HOUR', 'SECOND','MICROSECOND', 'YEAR_MONTH','DAY_HOUR',
'DAY_MINUTE','DAY_SECOND', 'DAY_MINUTE','DAY_SECOND',
'HOUR_MINUTE','HOUR_SECOND', 'HOUR_MINUTE','HOUR_SECOND',
'MINUTE_SECOND','DAY_MICROSECOND', 'MINUTE_SECOND','DAY_MICROSECOND',
'HOUR_MICROSECOND','MINUTE_MICROSECOND', 'HOUR_MICROSECOND','MINUTE_MICROSECOND',
'SECOND_MICROSECOND') default NULL, 'SECOND_MICROSECOND') default NULL,
'created' TIMESTAMP NOT NULL default '0000-00-00 00:00:00', created TIMESTAMP NOT NULL,
'modified' TIMESTAMP NOT NULL default '0000-00-00 00:00:00', modified TIMESTAMP NOT NULL,
'last_executed' DATETIME default NULL, last_executed DATETIME default NULL,
'starts' DATETIME default NULL, starts DATETIME default NULL,
'ends' DATETIME default NULL, ends DATETIME default NULL,
'status' ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED', status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
'on_completion' ENUM('DROP','PRESERVE') NOT NULL default 'DROP', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
'comment' varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', comment varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
PRIMARY KEY ('db','name') PRIMARY KEY (db,name)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events'; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
......
sql/event.h
View file @ a820fa4f
...@@ -195,24 +195,30 @@ event_timed_compare(event_timed **a, event_timed **b); ...@@ -195,24 +195,30 @@ event_timed_compare(event_timed **a, event_timed **b);
/* /*
CREATE TABLE `event` ( CREATE TABLE event (
`db` varchar(64) character set utf8 collate utf8_bin NOT NULL default '', db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
`name` varchar(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, body longblob NOT NULL,
`definer` varchar(77) character set utf8 collate utf8_bin NOT NULL default '', definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
`execute_at` datetime default NULL, execute_at DATETIME default NULL,
`transient_expression` int(11) default NULL, interval_value int(11) default NULL,
`interval_type` 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, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK',
`created` timestamp NOT NULL, 'SECOND','MICROSECOND', 'YEAR_MONTH','DAY_HOUR',
`modified` timestamp NOT NULL, 'DAY_MINUTE','DAY_SECOND',
`last_executed` datetime default NULL, 'HOUR_MINUTE','HOUR_SECOND',
`starts` datetime default NULL, 'MINUTE_SECOND','DAY_MICROSECOND',
`ends` datetime default NULL, 'HOUR_MICROSECOND','MINUTE_MICROSECOND',
`status` enum('ENABLED','DISABLED') NOT NULL default 'ENABLED', 'SECOND_MICROSECOND') default NULL,
`on_completion` enum('DROP','PRESERVE') NOT NULL default 'DROP', created TIMESTAMP NOT NULL,
`comment` varchar(64) character set utf8 collate utf8_bin NOT NULL default '', modified TIMESTAMP NOT NULL,
PRIMARY KEY (`db`,`name`) last_executed DATETIME default NULL,
) ENGINE=MyISAM DEFAULT CHARSET=utf8 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';
*/ */
#endif /* _EVENT_H_ */ #endif /* _EVENT_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7