WL#6599 New Data Dictionary and I_S integration

The value of INFORMATION_SCHEMA.COLUMNS.COLUMN_KEY was not
reported when the column was used by a FULLTEXT and SPATIAL
index. The patch fixes the same. The index_type cannot be
specified for FULLTEXT and SPATIAL indexes and so they are mostly
reported as 'MUL' (Multiple values) for column used in index.

There was no test case covering the scenario in suite main. Added
a test case in main.information_schema now.

Notes: Issue found by Tarique in a RQG run. Reviewed by Praveen.

Author: gopshank

mysql-test/r/information_schema.result

@@ -2128,3 +2128,44 @@ SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo
 SCHEMA_NAME
 SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';
 TABLE_NAME
+#
+# WL#6599: New Data Dictionary and I_S Integration.
+#
+# Test case to check INFORMATION_SCHEMA.COLUMNS.COLUMN_KEY
+# value if reported for FULLTEXT and SPATIAL index.
+#
+CREATE TABLE t1 (
+c1 INT,
+c2 INT,
+c3 CHAR(255),
+c4 CHAR(255),
+c5 CHAR(255),
+c6 POINT NOT NULL,
+c7 GEOMETRY NOT NULL,
+SPATIAL INDEX(c7),
+PRIMARY KEY (c1, c6),
+KEY c2_key (c2),
+FULLTEXT KEY c3_fts (c3),
+FULLTEXT KEY c4_fts (c4, c5));
+SELECT COLUMN_NAME, IS_NULLABLE,
+DATA_TYPE, COLLATION_NAME, COLUMN_KEY
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA='test';
+COLUMN_NAME	IS_NULLABLE	DATA_TYPE	COLLATION_NAME	COLUMN_KEY
+c1	NO	int	NULL	PRI
+c2	YES	int	NULL	MUL
+c3	YES	char	latin1_swedish_ci	MUL
+c4	YES	char	latin1_swedish_ci	MUL
+c5	YES	char	latin1_swedish_ci	
+c6	NO	point	NULL	PRI
+c7	NO	geometry	NULL	MUL
+SHOW COLUMNS FROM t1;
+Field	Type	Null	Key	Default	Extra
+c1	int(11)	NO	PRI	NULL	
+c2	int(11)	YES	MUL	NULL	
+c3	char(255)	YES	MUL	NULL	
+c4	char(255)	YES	MUL	NULL	
+c5	char(255)	YES		NULL	
+c6	point	NO	PRI	NULL	
+c7	geometry	NO	MUL	NULL	
+DROP TABLE t1;

mysql-test/r/information_schema_ci.result

@@ -2128,3 +2128,44 @@ SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo
 SCHEMA_NAME
 SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';
 TABLE_NAME
+#
+# WL#6599: New Data Dictionary and I_S Integration.
+#
+# Test case to check INFORMATION_SCHEMA.COLUMNS.COLUMN_KEY
+# value if reported for FULLTEXT and SPATIAL index.
+#
+CREATE TABLE t1 (
+c1 INT,
+c2 INT,
+c3 CHAR(255),
+c4 CHAR(255),
+c5 CHAR(255),
+c6 POINT NOT NULL,
+c7 GEOMETRY NOT NULL,
+SPATIAL INDEX(c7),
+PRIMARY KEY (c1, c6),
+KEY c2_key (c2),
+FULLTEXT KEY c3_fts (c3),
+FULLTEXT KEY c4_fts (c4, c5));
+SELECT COLUMN_NAME, IS_NULLABLE,
+DATA_TYPE, COLLATION_NAME, COLUMN_KEY
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA='test';
+COLUMN_NAME	IS_NULLABLE	DATA_TYPE	COLLATION_NAME	COLUMN_KEY
+c1	NO	int	NULL	PRI
+c2	YES	int	NULL	MUL
+c3	YES	char	latin1_swedish_ci	MUL
+c4	YES	char	latin1_swedish_ci	MUL
+c5	YES	char	latin1_swedish_ci	
+c6	NO	point	NULL	PRI
+c7	NO	geometry	NULL	MUL
+SHOW COLUMNS FROM t1;
+Field	Type	Null	Key	Default	Extra
+c1	int(11)	NO	PRI	NULL	
+c2	int(11)	YES	MUL	NULL	
+c3	char(255)	YES	MUL	NULL	
+c4	char(255)	YES	MUL	NULL	
+c5	char(255)	YES		NULL	
+c6	point	NO	PRI	NULL	
+c7	geometry	NO	MUL	NULL	
+DROP TABLE t1;

mysql-test/t/information_schema.test

@@ -1958,3 +1958,32 @@ DROP VIEW v1;
 SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo';
 # tables of ndbinfo schema should not be listed.
 SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';
+
+
+--echo #
+--echo # WL#6599: New Data Dictionary and I_S Integration.
+--echo #
+--echo # Test case to check INFORMATION_SCHEMA.COLUMNS.COLUMN_KEY
+--echo # value if reported for FULLTEXT and SPATIAL index.
+--echo #
+CREATE TABLE t1 (
+c1 INT,
+c2 INT,
+c3 CHAR(255),
+c4 CHAR(255),
+c5 CHAR(255),
+c6 POINT NOT NULL,
+c7 GEOMETRY NOT NULL,
+SPATIAL INDEX(c7),
+PRIMARY KEY (c1, c6),
+KEY c2_key (c2),
+FULLTEXT KEY c3_fts (c3),
+FULLTEXT KEY c4_fts (c4, c5));
+
+SELECT COLUMN_NAME, IS_NULLABLE,
+       DATA_TYPE, COLLATION_NAME, COLUMN_KEY
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE TABLE_SCHEMA='test';
+SHOW COLUMNS FROM t1;
+
+DROP TABLE t1;

sql/dd/dd_table.cc

@@ -847,11 +847,14 @@ fill_dd_index_elements_from_key_parts(const dd::Table *tab_obj,
         }
         break;
       case dd::Index::IT_MULTIPLE:
+      case dd::Index::IT_FULLTEXT:
+      case dd::Index::IT_SPATIAL:
         if (key_part == key_parts)
           const_cast<dd::Column*>(key_col_obj)->set_column_key(
                                                   dd::Column::CK_MULTIPLE);
         break;
       default:
+        DBUG_ASSERT(!"Invalid index type");
         break;
       }
     }