Bug#27745526: DIFFERENCES BETWEEN WL#6379 AND ACTUAL DD TABLE DEFINITIONS

We need to modify the DD table definitions to be consistent with the
contents of WL#6379. The following changes are done in this patch:

1. The TIMESTAMP fields 'created' and 'last_altered' have had their
   DEFAULT and ON UPDATE clauses removed, since these are obsolete
   due to the DD tables not being updated with DML. The exception
   is the table 'st_spatial_reference_systems'. Here, tha clauses
   are kept since the table is populated by means of SQL DML.

2. The 'engine' field, which is present in various tables, now uses the
   collation 'utf8_general_ci'.

3. The index on 'character_sets.default_collation_id' is changed from
   non-unique to unique.

4. The type of 'collations.pad_attribute' is changed from VARCHAR to ENUM.

5. A non-unique index is added on 'table_partitions.parent_partition_id'.

6. A foreign key is added on 'table_partitions.parent_partition_id'.

7. The type of 'tables.options' is changed from 'MEDIUMBLOB' to
   'MEDIUMTEXT'.

8. The ENUM type of 'tables.partition_type' is extended by an additional
   entry 'AUTO_LINEAR'.

9. A non-unique index is added on 'tables.type'.

10. Non-unique indexes are added on 'tables.view_connection_collation_id'
    and 'tables.view_client_collation_id'.

11. Foreign keys are added on 'tables.view_client_collation_id' and
    'tables.view_connection_collation_id'.

Change-Id: I2f22423a1d0b2a3381fdea401f2acbcf8ea124a5

Author: ssorumgard

mysql-test/r/dd_schema_definition_debug.result

@@ -163,8 +163,8 @@ Table	Create Table
 catalogs	CREATE TABLE `catalogs` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(64) <LCTN dependent collation> NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `last_altered` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL,
+  `last_altered` timestamp NOT NULL,
   `options` mediumtext COLLATE utf8_bin,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
@@ -180,7 +180,7 @@ character_sets	CREATE TABLE `character_sets` (
   `options` mediumtext COLLATE utf8_bin,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`),
-  KEY `default_collation_id` (`default_collation_id`),
+  UNIQUE KEY `default_collation_id` (`default_collation_id`),
   CONSTRAINT `character_sets_ibfk_1` FOREIGN KEY (`default_collation_id`) REFERENCES `collations` (`id`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
 SHOW CREATE TABLE mysql.collations;
@@ -191,7 +191,7 @@ collations	CREATE TABLE `collations` (
   `character_set_id` bigint(20) unsigned NOT NULL,
   `is_compiled` tinyint(1) NOT NULL,
   `sort_length` int(10) unsigned NOT NULL,
-  `pad_attribute` varchar(9) COLLATE utf8_bin NOT NULL,
+  `pad_attribute` enum('PAD SPACE','NO PAD') COLLATE utf8_bin NOT NULL,
   `options` mediumtext COLLATE utf8_bin,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`),
@@ -288,8 +288,8 @@ events	CREATE TABLE `events` (
   `ends` datetime DEFAULT NULL,
   `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') COLLATE utf8_bin NOT NULL,
   `on_completion` enum('DROP','PRESERVE') COLLATE utf8_bin NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `last_altered` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL,
+  `last_altered` timestamp NOT NULL,
   `last_executed` datetime DEFAULT NULL,
   `comment` varchar(2048) COLLATE utf8_bin NOT NULL,
   `originator` int(10) unsigned NOT NULL,
@@ -399,7 +399,7 @@ indexes	CREATE TABLE `indexes` (
   `options` mediumtext COLLATE utf8_bin,
   `se_private_data` mediumtext COLLATE utf8_bin,
   `tablespace_id` bigint(20) unsigned DEFAULT NULL,
-  `engine` varchar(64) COLLATE utf8_bin NOT NULL,
+  `engine` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `table_id` (`table_id`,`name`),
   KEY `tablespace_id` (`tablespace_id`),
@@ -526,8 +526,8 @@ routines	CREATE TABLE `routines` (
   `client_collation_id` bigint(20) unsigned NOT NULL,
   `connection_collation_id` bigint(20) unsigned NOT NULL,
   `schema_collation_id` bigint(20) unsigned NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `last_altered` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL,
+  `last_altered` timestamp NOT NULL,
   `comment` text COLLATE utf8_bin NOT NULL,
   `options` mediumtext COLLATE utf8_bin,
   `external_language` varchar(64) COLLATE utf8_bin NOT NULL DEFAULT 'SQL',
@@ -550,8 +550,8 @@ schemata	CREATE TABLE `schemata` (
   `catalog_id` bigint(20) unsigned NOT NULL,
   `name` varchar(64) <LCTN dependent collation> NOT NULL,
   `default_collation_id` bigint(20) unsigned NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `last_altered` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL,
+  `last_altered` timestamp NOT NULL,
   `options` mediumtext COLLATE utf8_bin,
   PRIMARY KEY (`id`),
   UNIQUE KEY `catalog_id` (`catalog_id`,`name`),
@@ -597,7 +597,7 @@ table_partitions	CREATE TABLE `table_partitions` (
   `number` smallint(5) unsigned NOT NULL,
   `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_tolower_ci NOT NULL,
   `description_utf8` text COLLATE utf8_bin,
-  `engine` varchar(64) COLLATE utf8_bin NOT NULL,
+  `engine` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   `comment` varchar(2048) COLLATE utf8_bin NOT NULL,
   `options` mediumtext COLLATE utf8_bin,
   `se_private_data` mediumtext COLLATE utf8_bin,
@@ -609,8 +609,10 @@ table_partitions	CREATE TABLE `table_partitions` (
   UNIQUE KEY `engine` (`engine`,`se_private_id`),
   KEY `engine_2` (`engine`),
   KEY `tablespace_id` (`tablespace_id`),
+  KEY `parent_partition_id` (`parent_partition_id`),
   CONSTRAINT `table_partitions_ibfk_1` FOREIGN KEY (`table_id`) REFERENCES `tables` (`id`),
-  CONSTRAINT `table_partitions_ibfk_2` FOREIGN KEY (`tablespace_id`) REFERENCES `tablespaces` (`id`)
+  CONSTRAINT `table_partitions_ibfk_2` FOREIGN KEY (`tablespace_id`) REFERENCES `tablespaces` (`id`),
+  CONSTRAINT `table_partitions_ibfk_3` FOREIGN KEY (`parent_partition_id`) REFERENCES `table_partitions` (`id`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
 SHOW CREATE TABLE mysql.table_stats;
 Table	Create Table
@@ -643,20 +645,20 @@ tables	CREATE TABLE `tables` (
   `collation_id` bigint(20) unsigned DEFAULT NULL,
   `comment` varchar(2048) COLLATE utf8_bin NOT NULL,
   `hidden` enum('Visible','System','SE','DDL') COLLATE utf8_bin NOT NULL,
-  `options` mediumblob,
+  `options` mediumtext COLLATE utf8_bin,
   `se_private_data` mediumtext COLLATE utf8_bin,
   `se_private_id` bigint(20) unsigned DEFAULT NULL,
   `tablespace_id` bigint(20) unsigned DEFAULT NULL,
-  `partition_type` enum('HASH','KEY_51','KEY_55','LINEAR_HASH','LINEAR_KEY_51','LINEAR_KEY_55','RANGE','LIST','RANGE_COLUMNS','LIST_COLUMNS','AUTO') COLLATE utf8_bin DEFAULT NULL,
+  `partition_type` enum('HASH','KEY_51','KEY_55','LINEAR_HASH','LINEAR_KEY_51','LINEAR_KEY_55','RANGE','LIST','RANGE_COLUMNS','LIST_COLUMNS','AUTO','AUTO_LINEAR') COLLATE utf8_bin DEFAULT NULL,
   `partition_expression` varchar(2048) COLLATE utf8_bin DEFAULT NULL,
   `partition_expression_utf8` varchar(2048) COLLATE utf8_bin DEFAULT NULL,
   `default_partitioning` enum('NO','YES','NUMBER') COLLATE utf8_bin DEFAULT NULL,
   `subpartition_type` enum('HASH','KEY_51','KEY_55','LINEAR_HASH','LINEAR_KEY_51','LINEAR_KEY_55') COLLATE utf8_bin DEFAULT NULL,
   `subpartition_expression` varchar(2048) COLLATE utf8_bin DEFAULT NULL,
   `subpartition_expression_utf8` varchar(2048) COLLATE utf8_bin DEFAULT NULL,
   `default_subpartitioning` enum('NO','YES','NUMBER') COLLATE utf8_bin DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `last_altered` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL,
+  `last_altered` timestamp NOT NULL,
   `view_definition` longblob,
   `view_definition_utf8` longtext COLLATE utf8_bin,
   `view_check_option` enum('NONE','LOCAL','CASCADED') COLLATE utf8_bin DEFAULT NULL,
@@ -671,11 +673,16 @@ tables	CREATE TABLE `tables` (
   UNIQUE KEY `schema_id` (`schema_id`,`name`),
   UNIQUE KEY `engine` (`engine`,`se_private_id`),
   KEY `engine_2` (`engine`),
+  KEY `type` (`type`),
   KEY `collation_id` (`collation_id`),
   KEY `tablespace_id` (`tablespace_id`),
+  KEY `view_client_collation_id` (`view_client_collation_id`),
+  KEY `view_connection_collation_id` (`view_connection_collation_id`),
   CONSTRAINT `tables_ibfk_1` FOREIGN KEY (`schema_id`) REFERENCES `schemata` (`id`),
   CONSTRAINT `tables_ibfk_2` FOREIGN KEY (`collation_id`) REFERENCES `collations` (`id`),
-  CONSTRAINT `tables_ibfk_3` FOREIGN KEY (`tablespace_id`) REFERENCES `tablespaces` (`id`)
+  CONSTRAINT `tables_ibfk_3` FOREIGN KEY (`tablespace_id`) REFERENCES `tablespaces` (`id`),
+  CONSTRAINT `tables_ibfk_4` FOREIGN KEY (`view_client_collation_id`) REFERENCES `collations` (`id`),
+  CONSTRAINT `tables_ibfk_5` FOREIGN KEY (`view_connection_collation_id`) REFERENCES `collations` (`id`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
 SHOW CREATE TABLE mysql.tablespace_files;
 Table	Create Table
@@ -696,7 +703,7 @@ tablespaces	CREATE TABLE `tablespaces` (
   `options` mediumtext COLLATE utf8_bin,
   `se_private_data` mediumtext COLLATE utf8_bin,
   `comment` varchar(2048) COLLATE utf8_bin NOT NULL,
-  `engine` varchar(64) COLLATE utf8_bin NOT NULL,
+  `engine` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
@@ -712,8 +719,8 @@ triggers	CREATE TABLE `triggers` (
   `action_order` int(10) unsigned NOT NULL,
   `action_statement` longblob NOT NULL,
   `action_statement_utf8` longtext COLLATE utf8_bin NOT NULL,
-  `created` timestamp(2) NOT NULL DEFAULT CURRENT_TIMESTAMP(2) ON UPDATE CURRENT_TIMESTAMP(2),
-  `last_altered` timestamp(2) NOT NULL DEFAULT CURRENT_TIMESTAMP(2),
+  `created` timestamp(2) NOT NULL,
+  `last_altered` timestamp(2) NOT NULL,
   `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','NOT_USED_9','NOT_USED_10','NOT_USED_11','NOT_USED_12','NOT_USED_13','NOT_USED_14','NOT_USED_15','NOT_USED_16','NOT_USED_17','NOT_USED_18','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','NOT_USED_29','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') COLLATE utf8_bin NOT NULL,
   `definer` varchar(93) COLLATE utf8_bin NOT NULL,
   `client_collation_id` bigint(20) unsigned NOT NULL,

mysql-test/r/information_schema_routines.result

@@ -518,7 +518,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	CREATED
 ORDINAL_POSITION	24
-COLUMN_DEFAULT	CURRENT_TIMESTAMP
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	timestamp
 CHARACTER_MAXIMUM_LENGTH	NULL
@@ -530,7 +530,7 @@ CHARACTER_SET_NAME	NULL
 COLLATION_NAME	NULL
 COLUMN_TYPE	timestamp
 COLUMN_KEY	
-EXTRA	on update CURRENT_TIMESTAMP
+EXTRA	
 PRIVILEGES	select
 COLUMN_COMMENT	
 GENERATION_EXPRESSION	
@@ -540,7 +540,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	LAST_ALTERED
 ORDINAL_POSITION	25
-COLUMN_DEFAULT	CURRENT_TIMESTAMP
+COLUMN_DEFAULT	NULL
 IS_NULLABLE	NO
 DATA_TYPE	timestamp
 CHARACTER_MAXIMUM_LENGTH	NULL
@@ -714,8 +714,8 @@ IS_DETERMINISTIC	varchar(3)	NO
 SQL_DATA_ACCESS	enum('CONTAINS SQL','NO SQL','READS SQL DATA','MODIFIES SQL DATA')	NO		NULL	
 SQL_PATH	binary(0)	YES		NULL	
 SECURITY_TYPE	enum('DEFAULT','INVOKER','DEFINER')	NO		NULL	
-CREATED	timestamp	NO		CURRENT_TIMESTAMP	on update CURRENT_TIMESTAMP
-LAST_ALTERED	timestamp	NO		CURRENT_TIMESTAMP	
+CREATED	timestamp	NO		NULL	
+LAST_ALTERED	timestamp	NO		NULL	
 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','NOT_USED_9','NOT_USED_10','NOT_USED_11','NOT_USED_12','NOT_USED_13','NOT_USED_14','NOT_USED_15','NOT_USED_16','NOT_USED_17','NOT_USED_18','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','NOT_USED_29','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','TIME_TRUNCATE_FRACTIONAL')	NO		NULL	
 ROUTINE_COMMENT	text	NO		NULL	
 DEFINER	varchar(93)	NO		NULL	

mysql-test/r/partition_error.result

@@ -1864,7 +1864,7 @@ SUBPARTITION BY HASH (`a`)
  (SUBPARTITION pMaxsp0 COMMENT = 'This is a long comment (2050 ascii characters)   50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = InnoDB,
   SUBPARTITION pMaxsp1 COMMENT = 'This is a long comment (2050 ascii characters)   50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = InnoDB)) */
 SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS
-WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
+WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test' ORDER BY PARTITION_NAME DESC;
 PARTITION_NAME	SUBPARTITION_NAME	PARTITION_COMMENT
 pUpTo10	p-10sp0	This is a long comment (2050 ascii characters)   50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|
 pUpTo10	p-10sp1	This is a long comment (2050 ascii characters)   50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|

mysql-test/r/show_check.result

@@ -139,7 +139,7 @@ def			TABLES	Max_data_length	Max_data_length	8	21	0	Y	32800	0	63
 def			TABLES	Index_length	Index_length	8	21	0	Y	32800	0	63
 def			TABLES	Data_free	Data_free	8	21	0	Y	32800	0	63
 def			TABLES	Auto_increment	Auto_increment	8	21	0	Y	32800	0	63
-def	mysql	tables	TABLES	Create_time	Create_time	7	19	0	N	129	0	63
+def	mysql	tables	TABLES	Create_time	Create_time	7	19	0	N	#	0	63
 def			TABLES	Update_time	Update_time	12	19	0	Y	128	0	63
 def			TABLES	Check_time	Check_time	12	19	0	Y	128	0	63
 def	mysql	collations	TABLES	Collation	Collation	253	256	0	Y	4096	0	255
@@ -884,7 +884,7 @@ def		COLLATIONS	COLLATIONS	Id	Id	8	20	2	N	32801	0	63
 def		COLLATIONS	COLLATIONS	Default	Default	253	9	0	N	1	0	33
 def		COLLATIONS	COLLATIONS	Compiled	Compiled	253	9	3	N	1	0	33
 def		COLLATIONS	COLLATIONS	Sortlen	Sortlen	3	10	1	N	36897	0	63
-def		COLLATIONS	COLLATIONS	Pad_attribute	Pad_attribute	253	27	9	N	4225	0	33
+def		COLLATIONS	COLLATIONS	Pad_attribute	Pad_attribute	254	27	9	N	4481	0	33
 Collation	Charset	Id	Default	Compiled	Sortlen	Pad_attribute
 latin1_bin	latin1	47		Yes	1	PAD SPACE
 ----------------------------------------------------------------
@@ -946,7 +946,7 @@ Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is
 def	mysql	TABLES	TABLES	TABLE_CATALOG	TABLE_CATALOG	253	192	3	N	#	0	33
 def	mysql	TABLES	TABLES	TABLE_SCHEMA	TABLE_SCHEMA	253	192	4	N	#	0	33
 def	mysql	TABLES	TABLES	TABLE_NAME	TABLE_NAME	253	192	2	N	#	0	33
-def	mysql	TABLES	TABLES	TABLE_TYPE	TABLE_TYPE	254	33	10	N	4481	0	33
+def	mysql	TABLES	TABLES	TABLE_TYPE	TABLE_TYPE	254	33	10	N	20873	0	33
 def		TABLES	TABLES	ENGINE	ENGINE	253	192	6	Y	0	31	33
 def	mysql	TABLES	TABLES	ROW_FORMAT	ROW_FORMAT	254	30	7	Y	384	0	33
 def	mysql	TABLES	TABLES	TABLE_COLLATION	TABLE_COLLATION	253	192	18	Y	20484	0	33
@@ -1014,7 +1014,7 @@ def	mysql	triggers	TRIGGERS	Event	Event	254	18	6	N	4481	0	33
 def	mysql	tables	TRIGGERS	Table	Table	253	192	2	N	4225	0	33
 def	mysql	triggers	TRIGGERS	Statement	Statement	252	4294967295	10	N	4241	0	33
 def	mysql	triggers	TRIGGERS	Timing	Timing	254	18	6	N	4481	0	33
-def	mysql	triggers	TRIGGERS	Created	Created	7	22	22	N	129	2	63
+def	mysql	triggers	TRIGGERS	Created	Created	7	22	22	N	4225	2	63
 def	mysql	triggers	TRIGGERS	sql_mode	sql_mode	254	1467	117	N	6273	0	33
 def	mysql	triggers	TRIGGERS	Definer	Definer	253	279	14	N	4225	0	33
 def	mysql	character_sets	TRIGGERS	character_set_client	character_set_client	253	192	6	N	4097	0	33