WL #1034 update

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

mysql-test/lib/init_db.sql

@@ -571,13 +571,13 @@ CREATE TABLE proc (
 
 
 CREATE TABLE event (
-  db VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
-  name VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
+  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 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,
-  transient_expression int(11) default NULL,
-  interval_type ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK',
+  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',
@@ -592,5 +592,5 @@ CREATE TABLE event (
   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)
+  PRIMARY KEY  (db,name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';

scripts/mysql_fix_privilege_tables.sql

@@ -533,28 +533,28 @@ ALTER TABLE proc  MODIFY db
 
 
 CREATE TABLE event (
-  'db' VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
-  'name' VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
-  'body' longblob NOT NULL,
-  'definer' VARCHAR(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
-  'execute_at' DATETIME default NULL,
-  'transient_expression' int(11) default NULL,
-  'interval_type' ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK',
+  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 '0000-00-00 00:00:00',
-  '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')
+  created TIMESTAMP NOT NULL,
+  modified TIMESTAMP NOT NULL,
+  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';
 
 

sql/event.h

@@ -195,24 +195,30 @@ event_timed_compare(event_timed **a, event_timed **b);
 
 
 /*
-CREATE TABLE `event` (
-  `db` varchar(64) character set utf8 collate utf8_bin NOT NULL default '',
-  `name` varchar(64) character set utf8 collate utf8_bin NOT NULL default '',
-  `body` longblob NOT NULL,
-  `definer` varchar(77) character set utf8 collate utf8_bin NOT NULL default '',
-  `execute_at` datetime default NULL,
-  `transient_expression` 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,
-  `created` timestamp NOT NULL,
-  `modified` timestamp NOT NULL,
-  `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
+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,
+  modified TIMESTAMP NOT NULL,
+  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';
 */
 
 #endif /* _EVENT_H_ */