fixes for funcs_1 suite

mysql-test/suite/funcs_1/r/is_cml_innodb.result

@@ -16,17 +16,17 @@ f11 LONGTEXT    UNICODE
 SELECT * FROM information_schema.columns
 WHERE table_schema LIKE 'test%'
 ORDER BY table_schema, table_name, column_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	test	t1	f1	1	NULL	YES	char	1	2	NULL	NULL	ucs2	ucs2_general_ci	char(1)			select,insert,update,references	
-NULL	test	t1	f10	9	NULL	YES	mediumtext	8388607	16777215	NULL	NULL	ucs2	ucs2_general_ci	mediumtext			select,insert,update,references	
-NULL	test	t1	f11	10	NULL	YES	longtext	2147483647	4294967295	NULL	NULL	ucs2	ucs2_general_ci	longtext			select,insert,update,references	
-NULL	test	t1	f2	2	NULL	YES	char	0	0	NULL	NULL	ucs2	ucs2_general_ci	char(0)			select,insert,update,references	
-NULL	test	t1	f3	3	NULL	YES	char	10	20	NULL	NULL	ucs2	ucs2_general_ci	char(10)			select,insert,update,references	
-NULL	test	t1	f5	4	NULL	YES	varchar	0	0	NULL	NULL	ucs2	ucs2_general_ci	varchar(0)			select,insert,update,references	
-NULL	test	t1	f6	5	NULL	YES	varchar	255	510	NULL	NULL	ucs2	ucs2_general_ci	varchar(255)			select,insert,update,references	
-NULL	test	t1	f7	6	NULL	YES	varchar	260	520	NULL	NULL	ucs2	ucs2_general_ci	varchar(260)			select,insert,update,references	
-NULL	test	t1	f8	7	NULL	YES	text	32767	65535	NULL	NULL	ucs2	ucs2_general_ci	text			select,insert,update,references	
-NULL	test	t1	f9	8	NULL	YES	tinytext	127	255	NULL	NULL	ucs2	ucs2_general_ci	tinytext			select,insert,update,references	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	test	t1	f1	1	NULL	YES	char	1	2	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(1)			select,insert,update,references	
+NULL	test	t1	f10	9	NULL	YES	mediumtext	8388607	16777215	NULL	NULL	NULL	ucs2	ucs2_general_ci	mediumtext			select,insert,update,references	
+NULL	test	t1	f11	10	NULL	YES	longtext	2147483647	4294967295	NULL	NULL	NULL	ucs2	ucs2_general_ci	longtext			select,insert,update,references	
+NULL	test	t1	f2	2	NULL	YES	char	0	0	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(0)			select,insert,update,references	
+NULL	test	t1	f3	3	NULL	YES	char	10	20	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(10)			select,insert,update,references	
+NULL	test	t1	f5	4	NULL	YES	varchar	0	0	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(0)			select,insert,update,references	
+NULL	test	t1	f6	5	NULL	YES	varchar	255	510	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(255)			select,insert,update,references	
+NULL	test	t1	f7	6	NULL	YES	varchar	260	520	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(260)			select,insert,update,references	
+NULL	test	t1	f8	7	NULL	YES	text	32767	65535	NULL	NULL	NULL	ucs2	ucs2_general_ci	text			select,insert,update,references	
+NULL	test	t1	f9	8	NULL	YES	tinytext	127	255	NULL	NULL	NULL	ucs2	ucs2_general_ci	tinytext			select,insert,update,references	
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################

mysql-test/suite/funcs_1/r/is_cml_memory.result

@@ -13,13 +13,13 @@ f7 VARCHAR(260) UNICODE
 SELECT * FROM information_schema.columns
 WHERE table_schema LIKE 'test%'
 ORDER BY table_schema, table_name, column_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	test	t1	f1	1	NULL	YES	char	1	2	NULL	NULL	ucs2	ucs2_general_ci	char(1)			select,insert,update,references	
-NULL	test	t1	f2	2	NULL	YES	char	0	0	NULL	NULL	ucs2	ucs2_general_ci	char(0)			select,insert,update,references	
-NULL	test	t1	f3	3	NULL	YES	char	10	20	NULL	NULL	ucs2	ucs2_general_ci	char(10)			select,insert,update,references	
-NULL	test	t1	f5	4	NULL	YES	varchar	0	0	NULL	NULL	ucs2	ucs2_general_ci	varchar(0)			select,insert,update,references	
-NULL	test	t1	f6	5	NULL	YES	varchar	255	510	NULL	NULL	ucs2	ucs2_general_ci	varchar(255)			select,insert,update,references	
-NULL	test	t1	f7	6	NULL	YES	varchar	260	520	NULL	NULL	ucs2	ucs2_general_ci	varchar(260)			select,insert,update,references	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	test	t1	f1	1	NULL	YES	char	1	2	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(1)			select,insert,update,references	
+NULL	test	t1	f2	2	NULL	YES	char	0	0	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(0)			select,insert,update,references	
+NULL	test	t1	f3	3	NULL	YES	char	10	20	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(10)			select,insert,update,references	
+NULL	test	t1	f5	4	NULL	YES	varchar	0	0	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(0)			select,insert,update,references	
+NULL	test	t1	f6	5	NULL	YES	varchar	255	510	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(255)			select,insert,update,references	
+NULL	test	t1	f7	6	NULL	YES	varchar	260	520	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(260)			select,insert,update,references	
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################

mysql-test/suite/funcs_1/r/is_cml_myisam.result

@@ -17,17 +17,17 @@ f11 LONGTEXT    UNICODE
 SELECT * FROM information_schema.columns
 WHERE table_schema LIKE 'test%'
 ORDER BY table_schema, table_name, column_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	test	t1	f1	1	NULL	YES	char	1	2	NULL	NULL	ucs2	ucs2_general_ci	char(1)			select,insert,update,references	
-NULL	test	t1	f10	9	NULL	YES	mediumtext	8388607	16777215	NULL	NULL	ucs2	ucs2_general_ci	mediumtext			select,insert,update,references	
-NULL	test	t1	f11	10	NULL	YES	longtext	2147483647	4294967295	NULL	NULL	ucs2	ucs2_general_ci	longtext			select,insert,update,references	
-NULL	test	t1	f2	2	NULL	YES	char	0	0	NULL	NULL	ucs2	ucs2_general_ci	char(0)			select,insert,update,references	
-NULL	test	t1	f3	3	NULL	YES	char	10	20	NULL	NULL	ucs2	ucs2_general_ci	char(10)			select,insert,update,references	
-NULL	test	t1	f5	4	NULL	YES	varchar	0	0	NULL	NULL	ucs2	ucs2_general_ci	varchar(0)			select,insert,update,references	
-NULL	test	t1	f6	5	NULL	YES	varchar	255	510	NULL	NULL	ucs2	ucs2_general_ci	varchar(255)			select,insert,update,references	
-NULL	test	t1	f7	6	NULL	YES	varchar	260	520	NULL	NULL	ucs2	ucs2_general_ci	varchar(260)			select,insert,update,references	
-NULL	test	t1	f8	7	NULL	YES	text	32767	65535	NULL	NULL	ucs2	ucs2_general_ci	text			select,insert,update,references	
-NULL	test	t1	f9	8	NULL	YES	tinytext	127	255	NULL	NULL	ucs2	ucs2_general_ci	tinytext			select,insert,update,references	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	test	t1	f1	1	NULL	YES	char	1	2	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(1)			select,insert,update,references	
+NULL	test	t1	f10	9	NULL	YES	mediumtext	8388607	16777215	NULL	NULL	NULL	ucs2	ucs2_general_ci	mediumtext			select,insert,update,references	
+NULL	test	t1	f11	10	NULL	YES	longtext	2147483647	4294967295	NULL	NULL	NULL	ucs2	ucs2_general_ci	longtext			select,insert,update,references	
+NULL	test	t1	f2	2	NULL	YES	char	0	0	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(0)			select,insert,update,references	
+NULL	test	t1	f3	3	NULL	YES	char	10	20	NULL	NULL	NULL	ucs2	ucs2_general_ci	char(10)			select,insert,update,references	
+NULL	test	t1	f5	4	NULL	YES	varchar	0	0	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(0)			select,insert,update,references	
+NULL	test	t1	f6	5	NULL	YES	varchar	255	510	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(255)			select,insert,update,references	
+NULL	test	t1	f7	6	NULL	YES	varchar	260	520	NULL	NULL	NULL	ucs2	ucs2_general_ci	varchar(260)			select,insert,update,references	
+NULL	test	t1	f8	7	NULL	YES	text	32767	65535	NULL	NULL	NULL	ucs2	ucs2_general_ci	text			select,insert,update,references	
+NULL	test	t1	f9	8	NULL	YES	tinytext	127	255	NULL	NULL	NULL	ucs2	ucs2_general_ci	tinytext			select,insert,update,references	
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################

mysql-test/suite/funcs_1/r/is_columns.result

@@ -40,6 +40,7 @@ CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL
 CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
 NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
 NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
+DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(32)	YES		NULL	
 COLLATION_NAME	varchar(32)	YES		NULL	
 COLUMN_TYPE	longtext	NO		NULL	
@@ -62,6 +63,7 @@ COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
   `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
   `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
   `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
+  `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
   `CHARACTER_SET_NAME` varchar(32) DEFAULT NULL,
   `COLLATION_NAME` varchar(32) DEFAULT NULL,
   `COLUMN_TYPE` longtext NOT NULL,
@@ -84,6 +86,7 @@ CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL
 CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
 NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
 NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
+DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(32)	YES		NULL	
 COLLATION_NAME	varchar(32)	YES		NULL	
 COLUMN_TYPE	longtext	NO		NULL	
@@ -117,17 +120,17 @@ GRANT INSERT(f1, f2) ON db_datadict.t2 TO 'testuser2'@'localhost';
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'db_datadict'
 ORDER BY table_schema, table_name, ordinal_position;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	db_datadict	t1	f1	1	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)	MUL		select,insert,update,references	
-NULL	db_datadict	t1	f2	2	NULL	YES	text	65535	65535	NULL	NULL	latin1	latin1_swedish_ci	text			select,insert,update,references	
-NULL	db_datadict	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
-NULL	db_datadict	t1	f4	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)	PRI	auto_increment	select,insert,update,references	
-NULL	db_datadict	t2	f1	1		NO	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)	PRI		select,insert,update,references	
-NULL	db_datadict	t2	f2	2	NULL	YES	text	65535	65535	NULL	NULL	latin1	latin1_swedish_ci	text			select,insert,update,references	
-NULL	db_datadict	t2	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
-NULL	db_datadict	t2	f4	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)	PRI		select,insert,update,references	
-NULL	db_datadict	v1	f1	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(1)			select,insert,update,references	
-NULL	db_datadict	v1	f2	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(1)			select,insert,update,references	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	db_datadict	t1	f1	1	NULL	YES	char	10	10	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(10)	MUL		select,insert,update,references	
+NULL	db_datadict	t1	f2	2	NULL	YES	text	65535	65535	NULL	NULL	NULL	latin1	latin1_swedish_ci	text			select,insert,update,references	
+NULL	db_datadict	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
+NULL	db_datadict	t1	f4	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)	PRI	auto_increment	select,insert,update,references	
+NULL	db_datadict	t2	f1	1		NO	char	10	10	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(10)	PRI		select,insert,update,references	
+NULL	db_datadict	t2	f2	2	NULL	YES	text	65535	65535	NULL	NULL	NULL	latin1	latin1_swedish_ci	text			select,insert,update,references	
+NULL	db_datadict	t2	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
+NULL	db_datadict	t2	f4	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)	PRI		select,insert,update,references	
+NULL	db_datadict	v1	f1	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(1)			select,insert,update,references	
+NULL	db_datadict	v1	f2	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(1)			select,insert,update,references	
 SHOW COLUMNS FROM db_datadict.t1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES	MUL	NULL	
@@ -148,10 +151,10 @@ f2	int(1)	NO		0
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'db_datadict'
 ORDER BY table_schema, table_name, ordinal_position;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	db_datadict	t1	f1	1	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)	MUL		select	
-NULL	db_datadict	t1	f2	2	NULL	YES	text	65535	65535	NULL	NULL	latin1	latin1_swedish_ci	text			select	
-NULL	db_datadict	v1	f2	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(1)			select	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	db_datadict	t1	f1	1	NULL	YES	char	10	10	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(10)	MUL		select	
+NULL	db_datadict	t1	f2	2	NULL	YES	text	65535	65535	NULL	NULL	NULL	latin1	latin1_swedish_ci	text			select	
+NULL	db_datadict	v1	f2	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(1)			select	
 SHOW COLUMNS FROM db_datadict.t1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES	MUL	NULL	
@@ -165,9 +168,9 @@ f2	int(1)	NO		0
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'db_datadict'
 ORDER BY table_schema, table_name, ordinal_position;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-NULL	db_datadict	t2	f1	1		NO	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)	PRI		insert	
-NULL	db_datadict	t2	f2	2	NULL	YES	text	65535	65535	NULL	NULL	latin1	latin1_swedish_ci	text			insert	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	db_datadict	t2	f1	1		NO	char	10	10	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(10)	PRI		insert	
+NULL	db_datadict	t2	f2	2	NULL	YES	text	65535	65535	NULL	NULL	NULL	latin1	latin1_swedish_ci	text			insert	
 SHOW COLUMNS FROM db_datadict.t1;
 ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 't1'
 SHOW COLUMNS FROM db_datadict.t2;
@@ -206,6 +209,7 @@ CHARACTER_MAXIMUM_LENGTH	12
 CHARACTER_OCTET_LENGTH	12
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
+DATETIME_PRECISION	NULL
 CHARACTER_SET_NAME	latin1
 COLLATION_NAME	latin1_swedish_ci
 COLUMN_TYPE	char(12)
@@ -411,6 +415,7 @@ CHARACTER_MAXIMUM_LENGTH	NULL
 CHARACTER_OCTET_LENGTH	NULL
 NUMERIC_PRECISION	10
 NUMERIC_SCALE	0
+DATETIME_PRECISION	NULL
 CHARACTER_SET_NAME	NULL
 COLLATION_NAME	NULL
 COLUMN_TYPE	int(1)
@@ -430,6 +435,7 @@ CHARACTER_MAXIMUM_LENGTH	1
 CHARACTER_OCTET_LENGTH	1
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
+DATETIME_PRECISION	NULL
 CHARACTER_SET_NAME	latin1
 COLLATION_NAME	latin1_german1_ci
 COLUMN_TYPE	varchar(1)

sql/item.cc

@@ -544,8 +544,6 @@ Item_result Item::cmp_type() const
   case MYSQL_TYPE_INT24:
   case MYSQL_TYPE_YEAR:
   case MYSQL_TYPE_BIT:
-  case MYSQL_TYPE_ENUM:
-  case MYSQL_TYPE_SET:
                            return INT_RESULT;
   case MYSQL_TYPE_FLOAT:
   case MYSQL_TYPE_DOUBLE:
@@ -558,6 +556,8 @@ Item_result Item::cmp_type() const
   case MYSQL_TYPE_BLOB:
   case MYSQL_TYPE_VAR_STRING:
   case MYSQL_TYPE_STRING:
+  case MYSQL_TYPE_ENUM:
+  case MYSQL_TYPE_SET:
   case MYSQL_TYPE_GEOMETRY:
                            return STRING_RESULT;
   case MYSQL_TYPE_TIMESTAMP: