Commit 16478e1a authored by unknown's avatar unknown
Browse files

post-push fix of fix for bug #16401 (field should be char not varchar) 

WL#1034 (Internal CRON)


mysql-test/lib/init_db.sql:
  fix for bug #16401, varchar -> char
mysql-test/r/system_mysql_db.result:
  fix the result of the test after pull (currently system_mysql_db is disabled)
parent f89018b7

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