Merge marty@192.168.123.145:MySQL/mysql-5.1-new (75322f8d) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/lib/init_db.sql

+32 −0

Original line number	Diff line number	Diff line
		@@ -595,6 +595,38 @@ CREATE TABLE event (
		ends DATETIME default NULL,
		status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
		on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
		sql_mode set(
		'REAL_AS_FLOAT',
		'PIPES_AS_CONCAT',
		'ANSI_QUOTES',
		'IGNORE_SPACE',
		'NOT_USED',
		'ONLY_FULL_GROUP_BY',
		'NO_UNSIGNED_SUBTRACTION',
		'NO_DIR_IN_CREATE',
		'POSTGRESQL',
		'ORACLE',
		'MSSQL',
		'DB2',
		'MAXDB',
		'NO_KEY_OPTIONS',
		'NO_TABLE_OPTIONS',
		'NO_FIELD_OPTIONS',
		'MYSQL323',
		'MYSQL40',
		'ANSI',
		'NO_AUTO_VALUE_ON_ZERO',
		'NO_BACKSLASH_ESCAPES',
		'STRICT_TRANS_TABLES',
		'STRICT_ALL_TABLES',
		'NO_ZERO_IN_DATE',
		'NO_ZERO_DATE',
		'INVALID_DATES',
		'ERROR_FOR_DIVISION_BY_ZERO',
		'TRADITIONAL',
		'NO_AUTO_CREATE_USER',
		'HIGH_NOT_PRECEDENCE'
		) DEFAULT '' NOT NULL,
		comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
		PRIMARY KEY (definer, db, name)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';

mysql-test/r/system_mysql_db.result

+1 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,7 @@ event CREATE TABLE `event` (
		`ends` datetime default NULL,
		`status` enum('ENABLED','DISABLED') NOT NULL default 'ENABLED',
		`on_completion` enum('DROP','PRESERVE') NOT NULL default 'DROP',
		`sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL default '',
		`comment` char(64) character set utf8 collate utf8_bin NOT NULL default '',
		PRIMARY KEY (`definer`,`db`,`name`)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'

scripts/mysql_create_system_tables.sh

+32 −0

Original line number	Diff line number	Diff line
		@@ -791,6 +791,38 @@ 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 sql_mode set("
		c_ev="$c_ev 'REAL_AS_FLOAT',"
		c_ev="$c_ev 'PIPES_AS_CONCAT',"
		c_ev="$c_ev 'ANSI_QUOTES',"
		c_ev="$c_ev 'IGNORE_SPACE',"
		c_ev="$c_ev 'NOT_USED',"
		c_ev="$c_ev 'ONLY_FULL_GROUP_BY',"
		c_ev="$c_ev 'NO_UNSIGNED_SUBTRACTION',"
		c_ev="$c_ev 'NO_DIR_IN_CREATE',"
		c_ev="$c_ev 'POSTGRESQL',"
		c_ev="$c_ev 'ORACLE',"
		c_ev="$c_ev 'MSSQL',"
		c_ev="$c_ev 'DB2',"
		c_ev="$c_ev 'MAXDB',"
		c_ev="$c_ev 'NO_KEY_OPTIONS',"
		c_ev="$c_ev 'NO_TABLE_OPTIONS',"
		c_ev="$c_ev 'NO_FIELD_OPTIONS',"
		c_ev="$c_ev 'MYSQL323',"
		c_ev="$c_ev 'MYSQL40',"
		c_ev="$c_ev 'ANSI',"
		c_ev="$c_ev 'NO_AUTO_VALUE_ON_ZERO',"
		c_ev="$c_ev 'NO_BACKSLASH_ESCAPES',"
		c_ev="$c_ev 'STRICT_TRANS_TABLES',"
		c_ev="$c_ev 'STRICT_ALL_TABLES',"
		c_ev="$c_ev 'NO_ZERO_IN_DATE',"
		c_ev="$c_ev 'NO_ZERO_DATE',"
		c_ev="$c_ev 'INVALID_DATES',"
		c_ev="$c_ev 'ERROR_FOR_DIVISION_BY_ZERO',"
		c_ev="$c_ev 'TRADITIONAL',"
		c_ev="$c_ev 'NO_AUTO_CREATE_USER',"
		c_ev="$c_ev 'HIGH_NOT_PRECEDENCE'"
		c_ev="$c_ev ) DEFAULT '' NOT NULL,"
		c_ev="$c_ev comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"
		c_ev="$c_ev PRIMARY KEY (definer, db, name)"
		c_ev="$c_ev ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';"

scripts/mysql_fix_privilege_tables.sql

+64 −0

Original line number	Diff line number	Diff line
		@@ -589,6 +589,38 @@ CREATE TABLE event (
		ends DATETIME default NULL,
		status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
		on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
		sql_mode set(
		'REAL_AS_FLOAT',
		'PIPES_AS_CONCAT',
		'ANSI_QUOTES',
		'IGNORE_SPACE',
		'NOT_USED',
		'ONLY_FULL_GROUP_BY',
		'NO_UNSIGNED_SUBTRACTION',
		'NO_DIR_IN_CREATE',
		'POSTGRESQL',
		'ORACLE',
		'MSSQL',
		'DB2',
		'MAXDB',
		'NO_KEY_OPTIONS',
		'NO_TABLE_OPTIONS',
		'NO_FIELD_OPTIONS',
		'MYSQL323',
		'MYSQL40',
		'ANSI',
		'NO_AUTO_VALUE_ON_ZERO',
		'NO_BACKSLASH_ESCAPES',
		'STRICT_TRANS_TABLES',
		'STRICT_ALL_TABLES',
		'NO_ZERO_IN_DATE',
		'NO_ZERO_DATE',
		'INVALID_DATES',
		'ERROR_FOR_DIVISION_BY_ZERO',
		'TRADITIONAL',
		'NO_AUTO_CREATE_USER',
		'HIGH_NOT_PRECEDENCE'
		) DEFAULT '' NOT NULL,
		comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
		PRIMARY KEY (db,name)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
		@@ -602,4 +634,36 @@ ALTER TABLE user add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT
		ALTER TABLE db add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL;
		ALTER TABLE event DROP PRIMARY KEY;
		ALTER TABLE event ADD PRIMARY KEY(definer, db, name);
		ALTER TABLE event ADD sql_mode
		set('REAL_AS_FLOAT',
		'PIPES_AS_CONCAT',
		'ANSI_QUOTES',
		'IGNORE_SPACE',
		'NOT_USED',
		'ONLY_FULL_GROUP_BY',
		'NO_UNSIGNED_SUBTRACTION',
		'NO_DIR_IN_CREATE',
		'POSTGRESQL',
		'ORACLE',
		'MSSQL',
		'DB2',
		'MAXDB',
		'NO_KEY_OPTIONS',
		'NO_TABLE_OPTIONS',
		'NO_FIELD_OPTIONS',
		'MYSQL323',
		'MYSQL40',
		'ANSI',
		'NO_AUTO_VALUE_ON_ZERO',
		'NO_BACKSLASH_ESCAPES',
		'STRICT_TRANS_TABLES',
		'STRICT_ALL_TABLES',
		'NO_ZERO_IN_DATE',
		'NO_ZERO_DATE',
		'INVALID_DATES',
		'ERROR_FOR_DIVISION_BY_ZERO',
		'TRADITIONAL',
		'NO_AUTO_CREATE_USER',
		'HIGH_NOT_PRECEDENCE'
		) DEFAULT '' NOT NULL;

sql/event.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ enum evex_table_field
		EVEX_FIELD_ENDS,
		EVEX_FIELD_STATUS,
		EVEX_FIELD_ON_COMPLETION,
		EVEX_FIELD_SQL_MODE,
		EVEX_FIELD_COMMENT,
		EVEX_FIELD_COUNT /* a cool trick to count the number of fields :) */
		} ;