List:Commits« Previous MessageNext Message »
From:Sergey Glukhov Date:February 24 2009 11:58am
Subject:bzr commit into mysql-5.0-bugteam branch (Sergey.Glukhov:2755)
Bug#42758
View as plain text  
#At file:///home/gluh/MySQL/mysql-5.0-bug-42758/ based on revid:patrick.crews@stripped

 2755 Sergey Glukhov	2009-02-24
      Bug#42758 INFORMATION_SCHEMA.COLUMNS is inconsistent
      MySQL column type has the following format:
      base_type [(dimension)] [unsigned] [zerofill]
      The problem is that we extract only base_type for DATA_TYPE value.
      The fix is to extract full type except of dimention part.
     @ mysql-test/r/information_schema.result
        test result
     @ mysql-test/suite/funcs_1/r/is_columns_innodb.result
        result fix
     @ mysql-test/suite/funcs_1/r/is_columns_memory.result
        result fix
     @ mysql-test/suite/funcs_1/r/is_columns_myisam.result
        result fix
     @ mysql-test/suite/funcs_1/r/is_columns_mysql.result
        result fix
     @ mysql-test/t/information_schema.test
        test case
     @ sql/sql_show.cc
        MySQL column type has the following format:
        base_type [(dimension)] [unsigned] [zerofill]
        The problem is that we extract only base_type for DATA_TYPE value.
        The fix is to extract full type except of dimention part.

    modified:
      mysql-test/r/information_schema.result
      mysql-test/suite/funcs_1/r/is_columns_innodb.result
      mysql-test/suite/funcs_1/r/is_columns_memory.result
      mysql-test/suite/funcs_1/r/is_columns_myisam.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/t/information_schema.test
      sql/sql_show.cc
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2009-02-09 20:52:40 +0000
+++ b/mysql-test/r/information_schema.result	2009-02-24 11:58:16 +0000
@@ -1432,4 +1432,27 @@ TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TA
 DROP TABLE test.t1;
 SET max_heap_table_size = DEFAULT;
 USE test;
+create table t1(
+tiny_uns tinyint unsigned,
+small_uns smallint unsigned,
+medium_uns mediumint unsigned,
+int_col_uns int unsigned,
+big_uns bigint unsigned,
+decimal_uns decimal(10,5) unsigned,
+fcol_uns float unsigned,
+dcol_uns double unsigned,
+enum_col enum(')','('));
+select COLUMN_NAME, DATA_TYPE,COLUMN_TYPE from INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_NAME='t1';
+COLUMN_NAME	DATA_TYPE	COLUMN_TYPE
+tiny_uns	tinyint unsigned	tinyint(3) unsigned
+small_uns	smallint unsigned	smallint(5) unsigned
+medium_uns	mediumint unsigned	mediumint(8) unsigned
+int_col_uns	int unsigned	int(10) unsigned
+big_uns	bigint unsigned	bigint(20) unsigned
+decimal_uns	decimal unsigned	decimal(10,5) unsigned
+fcol_uns	float unsigned	float unsigned
+dcol_uns	double unsigned	double unsigned
+enum_col	enum	enum(')','(')
+drop table t1;
 End of 5.0 tests.

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_innodb.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_innodb.result	2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_innodb.result	2009-02-24 11:58:16 +0000
@@ -432,53 +432,53 @@ NULL	test	tb1	f10	10	NULL	YES	mediumblob
 NULL	test	tb1	f11	11	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	test	tb1	f12	12	NULL	YES	binary	1	1	NULL	NULL	NULL	NULL	binary(1)			select,insert,update,references	
 NULL	test	tb1	f13	13	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(4)			select,insert,update,references	
-NULL	test	tb1	f14	14	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
-NULL	test	tb1	f15	15	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f16	16	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f14	14	NULL	YES	tinyint unsigned	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
+NULL	test	tb1	f15	15	NULL	YES	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f16	16	NULL	YES	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f17	17	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)			select,insert,update,references	
-NULL	test	tb1	f18	18	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-NULL	test	tb1	f19	19	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f18	18	NULL	YES	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	test	tb1	f19	19	NULL	YES	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f2	2	NULL	YES	char	0	0	NULL	NULL	latin1	latin1_bin	char(0)			select,insert,update,references	
-NULL	test	tb1	f20	20	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f20	20	NULL	YES	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f21	21	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(9)			select,insert,update,references	
-NULL	test	tb1	f22	22	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
-NULL	test	tb1	f23	23	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f24	24	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f22	22	NULL	YES	mediumint unsigned	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
+NULL	test	tb1	f23	23	NULL	YES	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f24	24	NULL	YES	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f25	25	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	test	tb1	f26	26	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-NULL	test	tb1	f27	27	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f28	28	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f26	26	NULL	YES	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	test	tb1	f27	27	NULL	YES	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f28	28	NULL	YES	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f29	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
 NULL	test	tb1	f3	3	NULL	YES	char	0	0	NULL	NULL	latin1	latin1_swedish_ci	char(0)			select,insert,update,references	
-NULL	test	tb1	f30	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	test	tb1	f31	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f32	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f30	30	NULL	YES	bigint unsigned	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	test	tb1	f31	31	NULL	YES	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f32	32	NULL	YES	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f33	33	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb1	f34	34	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f35	35	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f36	36	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f34	34	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f35	35	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f36	36	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f37	37	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f38	38	10	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb1	f39	39	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f39	39	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
 NULL	test	tb1	f4	4	NULL	YES	tinytext	255	255	NULL	NULL	latin1	latin1_swedish_ci	tinytext			select,insert,update,references	
-NULL	test	tb1	f40	40	10	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f41	41	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f42	42	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f43	43	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f44	44	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f40	40	10	NO	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f41	41	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f42	42	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f43	43	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f44	44	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f45	45	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f46	46	9.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb1	f47	47	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f48	48	9.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb1	f49	49	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f47	47	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f48	48	9.900000000000000000000000000000	NO	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb1	f49	49	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f5	5	NULL	YES	text	65535	65535	NULL	NULL	latin1	latin1_swedish_ci	text			select,insert,update,references	
-NULL	test	tb1	f50	50	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f51	51	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f52	52	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f50	50	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f51	51	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f52	52	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f53	53	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb1	f54	54	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f55	55	0000000099	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f56	56	0000000099	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f54	54	99	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f55	55	0000000099	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f56	56	0000000099	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f57	57	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f58	58	99	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
 NULL	test	tb1	f6	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	latin1	latin1_swedish_ci	mediumtext			select,insert,update,references	
@@ -495,20 +495,20 @@ NULL	test	tb2	f106	48	2000	NO	year	NULL	
 NULL	test	tb2	f107	49	2000	NO	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb2	f108	50	1enum	NO	enum	5	5	NULL	NULL	latin1	latin1_swedish_ci	enum('1enum','2enum')			select,insert,update,references	
 NULL	test	tb2	f109	51	1set	NO	set	9	9	NULL	NULL	latin1	latin1_swedish_ci	set('1set','2set')			select,insert,update,references	
-NULL	test	tb2	f59	1	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f60	2	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f61	3	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f62	4	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f63	5	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f64	6	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f59	1	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f60	2	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f61	3	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f62	4	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f63	5	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f64	6	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb2	f65	7	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb2	f66	8	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb2	f67	9	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f68	10	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb2	f69	11	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f70	12	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f71	13	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f72	14	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f67	9	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f68	10	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb2	f69	11	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f70	12	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f71	13	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f72	14	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb2	f73	15	NULL	YES	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test	tb2	f74	16	NULL	YES	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test	tb2	f75	17	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -549,65 +549,65 @@ NULL	test	tb3	f127	10	NULL	YES	mediumblo
 NULL	test	tb3	f128	11	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	test	tb3	f129	12		NO	binary	1	1	NULL	NULL	NULL	NULL	binary(1)			select,insert,update,references	
 NULL	test	tb3	f130	13	99	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(4)			select,insert,update,references	
-NULL	test	tb3	f131	14	99	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
-NULL	test	tb3	f132	15	099	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f133	16	099	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f131	14	99	NO	tinyint unsigned	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
+NULL	test	tb3	f132	15	099	NO	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f133	16	099	NO	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f134	17	999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)			select,insert,update,references	
-NULL	test	tb3	f135	18	999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-NULL	test	tb3	f136	19	00999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f137	20	00999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f135	18	999	NO	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	test	tb3	f136	19	00999	NO	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f137	20	00999	NO	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f138	21	9999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(9)			select,insert,update,references	
-NULL	test	tb3	f139	22	9999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
-NULL	test	tb3	f140	23	00009999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f141	24	00009999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f139	22	9999	NO	mediumint unsigned	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
+NULL	test	tb3	f140	23	00009999	NO	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f141	24	00009999	NO	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f142	25	99999	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	test	tb3	f143	26	99999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-NULL	test	tb3	f144	27	0000099999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f145	28	0000099999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f143	26	99999	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	test	tb3	f144	27	0000099999	NO	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f145	28	0000099999	NO	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f146	29	999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
-NULL	test	tb3	f147	30	999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	test	tb3	f148	31	00000000000000999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f149	32	00000000000000999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f147	30	999999	NO	bigint unsigned	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	test	tb3	f148	31	00000000000000999999	NO	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f149	32	00000000000000999999	NO	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f150	33	1000	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb3	f151	34	999	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f152	35	0000001000	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f153	36	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f151	34	999	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f152	35	0000001000	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f153	36	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f154	37	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f155	38	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb3	f156	39	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f157	40	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f158	41	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f159	42	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f160	43	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f161	44	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f156	39	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f157	40	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f158	41	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f159	42	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f160	43	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f161	44	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f162	45	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f163	46	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb3	f164	47	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f165	48	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb3	f166	49	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f167	50	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f168	51	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f169	52	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f164	47	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f165	48	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb3	f166	49	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f167	50	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f168	51	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f169	52	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f170	53	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb3	f171	54	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f172	55	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f173	56	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f171	54	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f172	55	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f173	56	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f174	57	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f175	58	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb4	f176	1	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f177	2	9	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f178	3	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f179	4	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f180	5	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f181	6	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f176	1	9	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f177	2	9	NO	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f178	3	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f179	4	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f180	5	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f181	6	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb4	f182	7	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb4	f183	8	9.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb4	f184	9	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f185	10	9.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb4	f186	11	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f187	12	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f188	13	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f189	14	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f184	9	9	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f185	10	9.000000000000000000000000000000	NO	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb4	f186	11	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f187	12	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f188	13	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f189	14	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb4	f190	15	88.8	NO	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test	tb4	f191	16	88.8	NO	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test	tb4	f192	17	00000000000000000088.8	NO	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -662,20 +662,20 @@ NULL	test1	tb2	f106	48	2000	NO	year	NULL
 NULL	test1	tb2	f107	49	2000	NO	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test1	tb2	f108	50	1enum	NO	enum	5	5	NULL	NULL	latin1	latin1_swedish_ci	enum('1enum','2enum')			select,insert,update,references	
 NULL	test1	tb2	f109	51	1set	NO	set	9	9	NULL	NULL	latin1	latin1_swedish_ci	set('1set','2set')			select,insert,update,references	
-NULL	test1	tb2	f59	1	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f60	2	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f61	3	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f62	4	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f63	5	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f64	6	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f59	1	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f60	2	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f61	3	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f62	4	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f63	5	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f64	6	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test1	tb2	f65	7	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test1	tb2	f66	8	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test1	tb2	f67	9	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f68	10	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test1	tb2	f69	11	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f70	12	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f71	13	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f72	14	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f67	9	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f68	10	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test1	tb2	f69	11	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f70	12	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f71	13	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f72	14	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test1	tb2	f73	15	NULL	YES	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test1	tb2	f74	16	NULL	YES	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test1	tb2	f75	17	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -758,9 +758,13 @@ AND CHARACTER_OCTET_LENGTH / CHARACTER_M
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 NULL	bigint	NULL	NULL
+NULL	bigint unsigned	NULL	NULL
+NULL	bigint unsigned zerofill	NULL	NULL
 NULL	date	NULL	NULL
 NULL	datetime	NULL	NULL
 NULL	decimal	NULL	NULL
+NULL	decimal unsigned	NULL	NULL
+NULL	decimal unsigned zerofill	NULL	NULL
 NULL	double	NULL	NULL
 NULL	double unsigned	NULL	NULL
 NULL	double unsigned zerofill	NULL	NULL
@@ -768,11 +772,19 @@ NULL	float	NULL	NULL
 NULL	float unsigned	NULL	NULL
 NULL	float unsigned zerofill	NULL	NULL
 NULL	int	NULL	NULL
+NULL	int unsigned	NULL	NULL
+NULL	int unsigned zerofill	NULL	NULL
 NULL	mediumint	NULL	NULL
+NULL	mediumint unsigned	NULL	NULL
+NULL	mediumint unsigned zerofill	NULL	NULL
 NULL	smallint	NULL	NULL
+NULL	smallint unsigned	NULL	NULL
+NULL	smallint unsigned zerofill	NULL	NULL
 NULL	time	NULL	NULL
 NULL	timestamp	NULL	NULL
 NULL	tinyint	NULL	NULL
+NULL	tinyint unsigned	NULL	NULL
+NULL	tinyint unsigned zerofill	NULL	NULL
 NULL	year	NULL	NULL
 NULL	char	latin1	latin1_bin
 NULL	char	latin1	latin1_swedish_ci
@@ -850,65 +862,65 @@ NULL	test	tb1	f3	char	0	0	latin1	latin1_
 1.0000	test	tb1	f11	longblob	4294967295	4294967295	NULL	NULL	longblob
 1.0000	test	tb1	f12	binary	1	1	NULL	NULL	binary(1)
 NULL	test	tb1	f13	tinyint	NULL	NULL	NULL	NULL	tinyint(4)
-NULL	test	tb1	f14	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned
-NULL	test	tb1	f15	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
-NULL	test	tb1	f16	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb1	f14	tinyint unsigned	NULL	NULL	NULL	NULL	tinyint(3) unsigned
+NULL	test	tb1	f15	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb1	f16	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
 NULL	test	tb1	f17	smallint	NULL	NULL	NULL	NULL	smallint(6)
-NULL	test	tb1	f18	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-NULL	test	tb1	f19	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
-NULL	test	tb1	f20	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb1	f18	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	test	tb1	f19	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb1	f20	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
 NULL	test	tb1	f21	mediumint	NULL	NULL	NULL	NULL	mediumint(9)
-NULL	test	tb1	f22	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned
-NULL	test	tb1	f23	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
-NULL	test	tb1	f24	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb1	f22	mediumint unsigned	NULL	NULL	NULL	NULL	mediumint(8) unsigned
+NULL	test	tb1	f23	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb1	f24	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
 NULL	test	tb1	f25	int	NULL	NULL	NULL	NULL	int(11)
-NULL	test	tb1	f26	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	test	tb1	f27	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
-NULL	test	tb1	f28	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb1	f26	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	test	tb1	f27	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb1	f28	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
 NULL	test	tb1	f29	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	test	tb1	f30	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	test	tb1	f31	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
-NULL	test	tb1	f32	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb1	f30	bigint unsigned	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	test	tb1	f31	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb1	f32	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
 NULL	test	tb1	f33	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb1	f34	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f35	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f36	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f34	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f35	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f36	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb1	f37	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f38	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb1	f39	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f40	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb1	f41	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f42	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb1	f43	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f44	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb1	f39	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f40	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb1	f41	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f42	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb1	f43	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f44	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb1	f45	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f46	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb1	f47	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f48	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb1	f49	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f50	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb1	f51	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f52	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb1	f47	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f48	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb1	f49	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f50	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb1	f51	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f52	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb1	f53	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb1	f54	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f55	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f56	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f54	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f55	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f56	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb1	f57	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f58	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb2	f59	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb2	f60	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb2	f61	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f62	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb2	f63	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f64	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb2	f59	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb2	f60	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb2	f61	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f62	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb2	f63	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f64	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb2	f65	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb2	f66	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb2	f67	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb2	f68	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb2	f69	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f70	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb2	f71	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f72	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb2	f67	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb2	f68	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb2	f69	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f70	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb2	f71	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f72	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb2	f73	double	NULL	NULL	NULL	NULL	double
 NULL	test	tb2	f74	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test	tb2	f75	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill
@@ -959,65 +971,65 @@ NULL	test	tb2	f107	year	NULL	NULL	NULL	N
 1.0000	test	tb3	f128	longblob	4294967295	4294967295	NULL	NULL	longblob
 1.0000	test	tb3	f129	binary	1	1	NULL	NULL	binary(1)
 NULL	test	tb3	f130	tinyint	NULL	NULL	NULL	NULL	tinyint(4)
-NULL	test	tb3	f131	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned
-NULL	test	tb3	f132	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
-NULL	test	tb3	f133	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb3	f131	tinyint unsigned	NULL	NULL	NULL	NULL	tinyint(3) unsigned
+NULL	test	tb3	f132	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb3	f133	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
 NULL	test	tb3	f134	smallint	NULL	NULL	NULL	NULL	smallint(6)
-NULL	test	tb3	f135	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-NULL	test	tb3	f136	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
-NULL	test	tb3	f137	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb3	f135	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	test	tb3	f136	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb3	f137	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
 NULL	test	tb3	f138	mediumint	NULL	NULL	NULL	NULL	mediumint(9)
-NULL	test	tb3	f139	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned
-NULL	test	tb3	f140	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
-NULL	test	tb3	f141	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb3	f139	mediumint unsigned	NULL	NULL	NULL	NULL	mediumint(8) unsigned
+NULL	test	tb3	f140	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb3	f141	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
 NULL	test	tb3	f142	int	NULL	NULL	NULL	NULL	int(11)
-NULL	test	tb3	f143	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	test	tb3	f144	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
-NULL	test	tb3	f145	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb3	f143	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	test	tb3	f144	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb3	f145	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
 NULL	test	tb3	f146	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	test	tb3	f147	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	test	tb3	f148	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
-NULL	test	tb3	f149	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb3	f147	bigint unsigned	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	test	tb3	f148	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb3	f149	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
 NULL	test	tb3	f150	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb3	f151	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f152	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f153	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f151	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f152	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f153	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb3	f154	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f155	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb3	f156	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f157	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb3	f158	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f159	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb3	f160	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f161	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb3	f156	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f157	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb3	f158	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f159	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb3	f160	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f161	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb3	f162	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f163	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb3	f164	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f165	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb3	f166	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f167	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb3	f168	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f169	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb3	f164	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f165	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb3	f166	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f167	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb3	f168	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f169	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb3	f170	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb3	f171	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f172	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f173	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f171	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f172	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f173	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb3	f174	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f175	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb4	f176	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb4	f177	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb4	f178	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f179	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb4	f180	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f181	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb4	f176	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb4	f177	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb4	f178	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f179	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb4	f180	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f181	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb4	f182	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb4	f183	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb4	f184	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb4	f185	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb4	f186	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f187	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb4	f188	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f189	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb4	f184	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb4	f185	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb4	f186	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f187	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb4	f188	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f189	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb4	f190	double	NULL	NULL	NULL	NULL	double
 NULL	test	tb4	f191	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test	tb4	f192	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill
@@ -1062,20 +1074,20 @@ NULL	test	tb4	f238	varchar	0	0	latin1	la
 1.0000	test	tb4	f239	varchar	20000	20000	latin1	latin1_bin	varchar(20000)
 1.0000	test	tb4	f240	varchar	2000	2000	latin1	latin1_swedish_ci	varchar(2000)
 1.0000	test	tb4	f241	char	100	100	latin1	latin1_swedish_ci	char(100)
-NULL	test1	tb2	f59	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test1	tb2	f60	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test1	tb2	f61	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f62	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test1	tb2	f63	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f64	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test1	tb2	f59	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test1	tb2	f60	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test1	tb2	f61	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f62	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test1	tb2	f63	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f64	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test1	tb2	f65	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test1	tb2	f66	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test1	tb2	f67	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test1	tb2	f68	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test1	tb2	f69	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f70	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test1	tb2	f71	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f72	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test1	tb2	f67	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test1	tb2	f68	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test1	tb2	f69	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f70	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test1	tb2	f71	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f72	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test1	tb2	f73	double	NULL	NULL	NULL	NULL	double
 NULL	test1	tb2	f74	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test1	tb2	f75	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_memory.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_memory.result	2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_memory.result	2009-02-24 11:58:16 +0000
@@ -419,51 +419,51 @@ NULL	test	t9	f3	3	NULL	YES	int	NULL	NULL
 NULL	test	tb1	f1	1	NULL	YES	char	1	1	NULL	NULL	latin1	latin1_swedish_ci	char(1)			select,insert,update,references	
 NULL	test	tb1	f12	4	NULL	YES	binary	1	1	NULL	NULL	NULL	NULL	binary(1)			select,insert,update,references	
 NULL	test	tb1	f13	5	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(4)			select,insert,update,references	
-NULL	test	tb1	f14	6	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
-NULL	test	tb1	f15	7	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f16	8	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f14	6	NULL	YES	tinyint unsigned	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
+NULL	test	tb1	f15	7	NULL	YES	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f16	8	NULL	YES	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f17	9	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)			select,insert,update,references	
-NULL	test	tb1	f18	10	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-NULL	test	tb1	f19	11	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f18	10	NULL	YES	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	test	tb1	f19	11	NULL	YES	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f2	2	NULL	YES	char	1	1	NULL	NULL	latin1	latin1_bin	char(1)			select,insert,update,references	
-NULL	test	tb1	f20	12	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f20	12	NULL	YES	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f21	13	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(9)			select,insert,update,references	
-NULL	test	tb1	f22	14	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
-NULL	test	tb1	f23	15	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f24	16	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f22	14	NULL	YES	mediumint unsigned	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
+NULL	test	tb1	f23	15	NULL	YES	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f24	16	NULL	YES	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f25	17	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	test	tb1	f26	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-NULL	test	tb1	f27	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f28	20	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f26	18	NULL	YES	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	test	tb1	f27	19	NULL	YES	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f28	20	NULL	YES	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f29	21	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
 NULL	test	tb1	f3	3	NULL	YES	char	1	1	NULL	NULL	latin1	latin1_swedish_ci	char(1)			select,insert,update,references	
-NULL	test	tb1	f30	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	test	tb1	f31	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f32	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f30	22	NULL	YES	bigint unsigned	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	test	tb1	f31	23	NULL	YES	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f32	24	NULL	YES	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f33	25	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb1	f34	26	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f35	27	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f36	28	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f34	26	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f35	27	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f36	28	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f37	29	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f38	30	10	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb1	f39	31	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f40	32	10	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f41	33	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f42	34	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f43	35	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f44	36	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f39	31	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f40	32	10	NO	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f41	33	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f42	34	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f43	35	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f44	36	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f45	37	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f46	38	9.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb1	f47	39	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f48	40	9.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb1	f49	41	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f50	42	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f51	43	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f52	44	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f47	39	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f48	40	9.900000000000000000000000000000	NO	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb1	f49	41	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f50	42	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f51	43	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f52	44	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f53	45	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb1	f54	46	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f55	47	0000000099	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f56	48	0000000099	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f54	46	99	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f55	47	0000000099	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f56	48	0000000099	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f57	49	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f58	50	99	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
 NULL	test	tb2	f100	42	00000000000000000008.8	NO	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -476,20 +476,20 @@ NULL	test	tb2	f106	48	2000	NO	year	NULL	
 NULL	test	tb2	f107	49	2000	NO	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb2	f108	50	1enum	NO	enum	5	5	NULL	NULL	latin1	latin1_swedish_ci	enum('1enum','2enum')			select,insert,update,references	
 NULL	test	tb2	f109	51	1set	NO	set	9	9	NULL	NULL	latin1	latin1_swedish_ci	set('1set','2set')			select,insert,update,references	
-NULL	test	tb2	f59	1	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f60	2	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f61	3	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f62	4	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f63	5	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f64	6	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f59	1	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f60	2	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f61	3	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f62	4	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f63	5	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f64	6	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb2	f65	7	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb2	f66	8	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb2	f67	9	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f68	10	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb2	f69	11	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f70	12	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f71	13	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f72	14	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f67	9	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f68	10	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb2	f69	11	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f70	12	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f71	13	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f72	14	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb2	f73	15	NULL	YES	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test	tb2	f74	16	NULL	YES	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test	tb2	f75	17	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -524,65 +524,65 @@ NULL	test	tb3	f121	4	NULL	YES	char	50	50
 NULL	test	tb3	f122	5	NULL	YES	char	50	50	NULL	NULL	latin1	latin1_swedish_ci	char(50)			select,insert,update,references	
 NULL	test	tb3	f129	6		NO	binary	1	1	NULL	NULL	NULL	NULL	binary(1)			select,insert,update,references	
 NULL	test	tb3	f130	7	99	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(4)			select,insert,update,references	
-NULL	test	tb3	f131	8	99	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
-NULL	test	tb3	f132	9	099	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f133	10	099	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f131	8	99	NO	tinyint unsigned	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
+NULL	test	tb3	f132	9	099	NO	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f133	10	099	NO	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f134	11	999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)			select,insert,update,references	
-NULL	test	tb3	f135	12	999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-NULL	test	tb3	f136	13	00999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f137	14	00999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f135	12	999	NO	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	test	tb3	f136	13	00999	NO	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f137	14	00999	NO	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f138	15	9999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(9)			select,insert,update,references	
-NULL	test	tb3	f139	16	9999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
-NULL	test	tb3	f140	17	00009999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f141	18	00009999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f139	16	9999	NO	mediumint unsigned	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
+NULL	test	tb3	f140	17	00009999	NO	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f141	18	00009999	NO	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f142	19	99999	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	test	tb3	f143	20	99999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-NULL	test	tb3	f144	21	0000099999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f145	22	0000099999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f143	20	99999	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	test	tb3	f144	21	0000099999	NO	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f145	22	0000099999	NO	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f146	23	999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
-NULL	test	tb3	f147	24	999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	test	tb3	f148	25	00000000000000999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f149	26	00000000000000999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f147	24	999999	NO	bigint unsigned	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	test	tb3	f148	25	00000000000000999999	NO	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f149	26	00000000000000999999	NO	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f150	27	1000	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb3	f151	28	999	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f152	29	0000001000	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f153	30	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f151	28	999	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f152	29	0000001000	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f153	30	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f154	31	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f155	32	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb3	f156	33	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f157	34	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f158	35	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f159	36	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f160	37	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f161	38	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f156	33	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f157	34	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f158	35	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f159	36	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f160	37	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f161	38	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f162	39	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f163	40	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb3	f164	41	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f165	42	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb3	f166	43	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f167	44	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f168	45	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f169	46	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f164	41	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f165	42	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb3	f166	43	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f167	44	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f168	45	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f169	46	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f170	47	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb3	f171	48	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f172	49	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f173	50	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f171	48	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f172	49	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f173	50	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f174	51	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f175	52	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb4	f176	1	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f177	2	9	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f178	3	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f179	4	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f180	5	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f181	6	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f176	1	9	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f177	2	9	NO	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f178	3	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f179	4	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f180	5	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f181	6	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb4	f182	7	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb4	f183	8	9.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb4	f184	9	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f185	10	9.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb4	f186	11	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f187	12	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f188	13	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f189	14	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f184	9	9	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f185	10	9.000000000000000000000000000000	NO	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb4	f186	11	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f187	12	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f188	13	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f189	14	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb4	f190	15	88.8	NO	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test	tb4	f191	16	88.8	NO	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test	tb4	f192	17	00000000000000000088.8	NO	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -636,20 +636,20 @@ NULL	test1	tb2	f106	48	2000	NO	year	NULL
 NULL	test1	tb2	f107	49	2000	NO	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test1	tb2	f108	50	1enum	NO	enum	5	5	NULL	NULL	latin1	latin1_swedish_ci	enum('1enum','2enum')			select,insert,update,references	
 NULL	test1	tb2	f109	51	1set	NO	set	9	9	NULL	NULL	latin1	latin1_swedish_ci	set('1set','2set')			select,insert,update,references	
-NULL	test1	tb2	f59	1	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f60	2	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f61	3	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f62	4	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f63	5	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f64	6	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f59	1	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f60	2	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f61	3	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f62	4	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f63	5	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f64	6	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test1	tb2	f65	7	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test1	tb2	f66	8	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test1	tb2	f67	9	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f68	10	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test1	tb2	f69	11	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f70	12	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f71	13	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f72	14	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f67	9	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f68	10	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test1	tb2	f69	11	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f70	12	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f71	13	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f72	14	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test1	tb2	f73	15	NULL	YES	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test1	tb2	f74	16	NULL	YES	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test1	tb2	f75	17	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -724,9 +724,13 @@ AND CHARACTER_OCTET_LENGTH / CHARACTER_M
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 NULL	bigint	NULL	NULL
+NULL	bigint unsigned	NULL	NULL
+NULL	bigint unsigned zerofill	NULL	NULL
 NULL	date	NULL	NULL
 NULL	datetime	NULL	NULL
 NULL	decimal	NULL	NULL
+NULL	decimal unsigned	NULL	NULL
+NULL	decimal unsigned zerofill	NULL	NULL
 NULL	double	NULL	NULL
 NULL	double unsigned	NULL	NULL
 NULL	double unsigned zerofill	NULL	NULL
@@ -734,11 +738,19 @@ NULL	float	NULL	NULL
 NULL	float unsigned	NULL	NULL
 NULL	float unsigned zerofill	NULL	NULL
 NULL	int	NULL	NULL
+NULL	int unsigned	NULL	NULL
+NULL	int unsigned zerofill	NULL	NULL
 NULL	mediumint	NULL	NULL
+NULL	mediumint unsigned	NULL	NULL
+NULL	mediumint unsigned zerofill	NULL	NULL
 NULL	smallint	NULL	NULL
+NULL	smallint unsigned	NULL	NULL
+NULL	smallint unsigned zerofill	NULL	NULL
 NULL	time	NULL	NULL
 NULL	timestamp	NULL	NULL
 NULL	tinyint	NULL	NULL
+NULL	tinyint unsigned	NULL	NULL
+NULL	tinyint unsigned zerofill	NULL	NULL
 NULL	varbinary	NULL	NULL
 NULL	year	NULL	NULL
 --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values
@@ -806,65 +818,65 @@ NULL	test	t9	f3	int	NULL	NULL	NULL	NULL	
 1.0000	test	tb1	f3	char	1	1	latin1	latin1_swedish_ci	char(1)
 1.0000	test	tb1	f12	binary	1	1	NULL	NULL	binary(1)
 NULL	test	tb1	f13	tinyint	NULL	NULL	NULL	NULL	tinyint(4)
-NULL	test	tb1	f14	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned
-NULL	test	tb1	f15	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
-NULL	test	tb1	f16	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb1	f14	tinyint unsigned	NULL	NULL	NULL	NULL	tinyint(3) unsigned
+NULL	test	tb1	f15	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb1	f16	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
 NULL	test	tb1	f17	smallint	NULL	NULL	NULL	NULL	smallint(6)
-NULL	test	tb1	f18	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-NULL	test	tb1	f19	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
-NULL	test	tb1	f20	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb1	f18	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	test	tb1	f19	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb1	f20	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
 NULL	test	tb1	f21	mediumint	NULL	NULL	NULL	NULL	mediumint(9)
-NULL	test	tb1	f22	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned
-NULL	test	tb1	f23	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
-NULL	test	tb1	f24	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb1	f22	mediumint unsigned	NULL	NULL	NULL	NULL	mediumint(8) unsigned
+NULL	test	tb1	f23	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb1	f24	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
 NULL	test	tb1	f25	int	NULL	NULL	NULL	NULL	int(11)
-NULL	test	tb1	f26	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	test	tb1	f27	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
-NULL	test	tb1	f28	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb1	f26	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	test	tb1	f27	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb1	f28	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
 NULL	test	tb1	f29	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	test	tb1	f30	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	test	tb1	f31	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
-NULL	test	tb1	f32	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb1	f30	bigint unsigned	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	test	tb1	f31	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb1	f32	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
 NULL	test	tb1	f33	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb1	f34	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f35	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f36	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f34	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f35	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f36	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb1	f37	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f38	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb1	f39	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f40	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb1	f41	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f42	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb1	f43	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f44	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb1	f39	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f40	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb1	f41	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f42	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb1	f43	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f44	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb1	f45	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f46	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb1	f47	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f48	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb1	f49	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f50	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb1	f51	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f52	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb1	f47	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f48	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb1	f49	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f50	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb1	f51	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f52	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb1	f53	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb1	f54	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f55	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f56	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f54	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f55	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f56	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb1	f57	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f58	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb2	f59	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb2	f60	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb2	f61	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f62	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb2	f63	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f64	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb2	f59	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb2	f60	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb2	f61	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f62	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb2	f63	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f64	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb2	f65	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb2	f66	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb2	f67	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb2	f68	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb2	f69	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f70	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb2	f71	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f72	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb2	f67	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb2	f68	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb2	f69	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f70	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb2	f71	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f72	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb2	f73	double	NULL	NULL	NULL	NULL	double
 NULL	test	tb2	f74	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test	tb2	f75	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill
@@ -909,65 +921,65 @@ NULL	test	tb2	f107	year	NULL	NULL	NULL	N
 1.0000	test	tb3	f122	char	50	50	latin1	latin1_swedish_ci	char(50)
 1.0000	test	tb3	f129	binary	1	1	NULL	NULL	binary(1)
 NULL	test	tb3	f130	tinyint	NULL	NULL	NULL	NULL	tinyint(4)
-NULL	test	tb3	f131	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned
-NULL	test	tb3	f132	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
-NULL	test	tb3	f133	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb3	f131	tinyint unsigned	NULL	NULL	NULL	NULL	tinyint(3) unsigned
+NULL	test	tb3	f132	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb3	f133	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
 NULL	test	tb3	f134	smallint	NULL	NULL	NULL	NULL	smallint(6)
-NULL	test	tb3	f135	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-NULL	test	tb3	f136	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
-NULL	test	tb3	f137	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb3	f135	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	test	tb3	f136	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb3	f137	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
 NULL	test	tb3	f138	mediumint	NULL	NULL	NULL	NULL	mediumint(9)
-NULL	test	tb3	f139	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned
-NULL	test	tb3	f140	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
-NULL	test	tb3	f141	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb3	f139	mediumint unsigned	NULL	NULL	NULL	NULL	mediumint(8) unsigned
+NULL	test	tb3	f140	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb3	f141	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
 NULL	test	tb3	f142	int	NULL	NULL	NULL	NULL	int(11)
-NULL	test	tb3	f143	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	test	tb3	f144	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
-NULL	test	tb3	f145	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb3	f143	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	test	tb3	f144	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb3	f145	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
 NULL	test	tb3	f146	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	test	tb3	f147	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	test	tb3	f148	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
-NULL	test	tb3	f149	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb3	f147	bigint unsigned	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	test	tb3	f148	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb3	f149	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
 NULL	test	tb3	f150	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb3	f151	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f152	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f153	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f151	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f152	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f153	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb3	f154	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f155	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb3	f156	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f157	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb3	f158	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f159	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb3	f160	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f161	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb3	f156	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f157	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb3	f158	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f159	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb3	f160	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f161	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb3	f162	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f163	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb3	f164	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f165	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb3	f166	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f167	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb3	f168	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f169	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb3	f164	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f165	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb3	f166	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f167	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb3	f168	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f169	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb3	f170	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb3	f171	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f172	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f173	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f171	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f172	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f173	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb3	f174	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f175	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb4	f176	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb4	f177	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb4	f178	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f179	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb4	f180	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f181	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb4	f176	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb4	f177	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb4	f178	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f179	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb4	f180	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f181	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb4	f182	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb4	f183	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb4	f184	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb4	f185	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb4	f186	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f187	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb4	f188	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f189	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb4	f184	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb4	f185	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb4	f186	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f187	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb4	f188	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f189	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb4	f190	double	NULL	NULL	NULL	NULL	double
 NULL	test	tb4	f191	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test	tb4	f192	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill
@@ -1011,20 +1023,20 @@ NULL	test	tb4	f224	year	NULL	NULL	NULL	N
 1.0000	test	tb4	f238	varchar	25000	25000	latin1	latin1_bin	varchar(25000)
 NULL	test	tb4	f239	varbinary	0	0	NULL	NULL	varbinary(0)
 1.0000	test	tb4	f240	varchar	1200	1200	latin1	latin1_swedish_ci	varchar(1200)
-NULL	test1	tb2	f59	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test1	tb2	f60	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test1	tb2	f61	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f62	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test1	tb2	f63	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f64	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test1	tb2	f59	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test1	tb2	f60	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test1	tb2	f61	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f62	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test1	tb2	f63	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f64	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test1	tb2	f65	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test1	tb2	f66	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test1	tb2	f67	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test1	tb2	f68	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test1	tb2	f69	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f70	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test1	tb2	f71	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f72	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test1	tb2	f67	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test1	tb2	f68	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test1	tb2	f69	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f70	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test1	tb2	f71	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f72	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test1	tb2	f73	double	NULL	NULL	NULL	NULL	double
 NULL	test1	tb2	f74	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test1	tb2	f75	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_myisam.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_myisam.result	2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_myisam.result	2009-02-24 11:58:16 +0000
@@ -461,53 +461,53 @@ NULL	test	tb1	f10	10	NULL	YES	mediumblob
 NULL	test	tb1	f11	11	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	test	tb1	f12	12	NULL	YES	binary	1	1	NULL	NULL	NULL	NULL	binary(1)			select,insert,update,references	
 NULL	test	tb1	f13	13	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(4)			select,insert,update,references	
-NULL	test	tb1	f14	14	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
-NULL	test	tb1	f15	15	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f16	16	NULL	YES	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f14	14	NULL	YES	tinyint unsigned	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
+NULL	test	tb1	f15	15	NULL	YES	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f16	16	NULL	YES	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f17	17	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)			select,insert,update,references	
-NULL	test	tb1	f18	18	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-NULL	test	tb1	f19	19	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f18	18	NULL	YES	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	test	tb1	f19	19	NULL	YES	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f2	2	NULL	YES	char	1	1	NULL	NULL	latin1	latin1_bin	char(1)			select,insert,update,references	
-NULL	test	tb1	f20	20	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f20	20	NULL	YES	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f21	21	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(9)			select,insert,update,references	
-NULL	test	tb1	f22	22	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
-NULL	test	tb1	f23	23	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f24	24	NULL	YES	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f22	22	NULL	YES	mediumint unsigned	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
+NULL	test	tb1	f23	23	NULL	YES	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f24	24	NULL	YES	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f25	25	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	test	tb1	f26	26	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-NULL	test	tb1	f27	27	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f28	28	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f26	26	NULL	YES	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	test	tb1	f27	27	NULL	YES	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f28	28	NULL	YES	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f29	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
 NULL	test	tb1	f3	3	NULL	YES	char	1	1	NULL	NULL	latin1	latin1_swedish_ci	char(1)			select,insert,update,references	
-NULL	test	tb1	f30	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	test	tb1	f31	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f32	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f30	30	NULL	YES	bigint unsigned	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	test	tb1	f31	31	NULL	YES	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f32	32	NULL	YES	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f33	33	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb1	f34	34	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f35	35	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f36	36	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f34	34	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f35	35	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f36	36	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f37	37	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f38	38	10	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb1	f39	39	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f39	39	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
 NULL	test	tb1	f4	4	NULL	YES	tinytext	255	255	NULL	NULL	latin1	latin1_swedish_ci	tinytext			select,insert,update,references	
-NULL	test	tb1	f40	40	10	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f41	41	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f42	42	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f43	43	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f44	44	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f40	40	10	NO	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f41	41	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f42	42	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f43	43	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f44	44	0000000000000000000000000000000000000000000000000000000000000010	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f45	45	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f46	46	9.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb1	f47	47	10	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f48	48	9.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb1	f49	49	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f47	47	10	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f48	48	9.900000000000000000000000000000	NO	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb1	f49	49	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f5	5	NULL	YES	text	65535	65535	NULL	NULL	latin1	latin1_swedish_ci	text			select,insert,update,references	
-NULL	test	tb1	f50	50	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f51	51	0000000010	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f52	52	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f50	50	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f51	51	0000000010	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f52	52	000000000000000000000000000000009.900000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f53	53	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb1	f54	54	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb1	f55	55	0000000099	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb1	f56	56	0000000099	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f54	54	99	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb1	f55	55	0000000099	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb1	f56	56	0000000099	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb1	f57	57	99	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb1	f58	58	99	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
 NULL	test	tb1	f6	6	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	latin1	latin1_swedish_ci	mediumtext			select,insert,update,references	
@@ -532,20 +532,20 @@ NULL	test	tb2	f114	56	NULL	YES	varbinary
 NULL	test	tb2	f115	57	NULL	YES	varbinary	27	27	NULL	NULL	NULL	NULL	varbinary(27)			select,insert,update,references	
 NULL	test	tb2	f116	58	NULL	YES	varbinary	64	64	NULL	NULL	NULL	NULL	varbinary(64)			select,insert,update,references	
 NULL	test	tb2	f117	59	NULL	YES	varbinary	192	192	NULL	NULL	NULL	NULL	varbinary(192)			select,insert,update,references	
-NULL	test	tb2	f59	1	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f60	2	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f61	3	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f62	4	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f63	5	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f64	6	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f59	1	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f60	2	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f61	3	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f62	4	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f63	5	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f64	6	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb2	f65	7	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb2	f66	8	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb2	f67	9	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb2	f68	10	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb2	f69	11	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f70	12	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f71	13	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb2	f72	14	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f67	9	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb2	f68	10	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb2	f69	11	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f70	12	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f71	13	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb2	f72	14	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb2	f73	15	NULL	YES	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test	tb2	f74	16	NULL	YES	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test	tb2	f75	17	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -586,65 +586,65 @@ NULL	test	tb3	f127	10	NULL	YES	mediumblo
 NULL	test	tb3	f128	11	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	test	tb3	f129	12		NO	binary	1	1	NULL	NULL	NULL	NULL	binary(1)			select,insert,update,references	
 NULL	test	tb3	f130	13	99	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(4)			select,insert,update,references	
-NULL	test	tb3	f131	14	99	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
-NULL	test	tb3	f132	15	099	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f133	16	099	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f131	14	99	NO	tinyint unsigned	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
+NULL	test	tb3	f132	15	099	NO	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f133	16	099	NO	tinyint unsigned zerofill	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f134	17	999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)			select,insert,update,references	
-NULL	test	tb3	f135	18	999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-NULL	test	tb3	f136	19	00999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f137	20	00999	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f135	18	999	NO	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	test	tb3	f136	19	00999	NO	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f137	20	00999	NO	smallint unsigned zerofill	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f138	21	9999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(9)			select,insert,update,references	
-NULL	test	tb3	f139	22	9999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
-NULL	test	tb3	f140	23	00009999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f141	24	00009999	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f139	22	9999	NO	mediumint unsigned	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned			select,insert,update,references	
+NULL	test	tb3	f140	23	00009999	NO	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f141	24	00009999	NO	mediumint unsigned zerofill	NULL	NULL	7	0	NULL	NULL	mediumint(8) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f142	25	99999	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	test	tb3	f143	26	99999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-NULL	test	tb3	f144	27	0000099999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f145	28	0000099999	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f143	26	99999	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	test	tb3	f144	27	0000099999	NO	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f145	28	0000099999	NO	int unsigned zerofill	NULL	NULL	10	0	NULL	NULL	int(10) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f146	29	999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
-NULL	test	tb3	f147	30	999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-NULL	test	tb3	f148	31	00000000000000999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f149	32	00000000000000999999	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f147	30	999999	NO	bigint unsigned	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	test	tb3	f148	31	00000000000000999999	NO	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f149	32	00000000000000999999	NO	bigint unsigned zerofill	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f150	33	1000	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb3	f151	34	999	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f152	35	0000001000	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f153	36	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f151	34	999	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f152	35	0000001000	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f153	36	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f154	37	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f155	38	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb3	f156	39	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f157	40	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f158	41	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f159	42	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f160	43	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f161	44	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f156	39	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f157	40	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f158	41	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f159	42	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f160	43	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f161	44	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f162	45	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f163	46	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb3	f164	47	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f165	48	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb3	f166	49	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f167	50	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f168	51	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f169	52	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f164	47	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f165	48	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb3	f166	49	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f167	50	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f168	51	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f169	52	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f170	53	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
-NULL	test	tb3	f171	54	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb3	f172	55	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb3	f173	56	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f171	54	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb3	f172	55	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb3	f173	56	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb3	f174	57	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb3	f175	58	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0)			select,insert,update,references	
-NULL	test	tb4	f176	1	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f177	2	9	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f178	3	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f179	4	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f180	5	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f181	6	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f176	1	9	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f177	2	9	NO	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f178	3	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f179	4	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f180	5	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f181	6	0000000000000000000000000000000000000000000000000000000000000009	NO	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test	tb4	f182	7	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test	tb4	f183	8	9.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test	tb4	f184	9	9	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test	tb4	f185	10	9.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test	tb4	f186	11	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f187	12	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f188	13	0000000009	NO	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test	tb4	f189	14	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f184	9	9	NO	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test	tb4	f185	10	9.000000000000000000000000000000	NO	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test	tb4	f186	11	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f187	12	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f188	13	0000000009	NO	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test	tb4	f189	14	000000000000000000000000000000009.000000000000000000000000000000	NO	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test	tb4	f190	15	88.8	NO	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test	tb4	f191	16	88.8	NO	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test	tb4	f192	17	00000000000000000088.8	NO	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -716,20 +716,20 @@ NULL	test1	tb2	f114	56	NULL	YES	varbinar
 NULL	test1	tb2	f115	57	NULL	YES	varbinary	27	27	NULL	NULL	NULL	NULL	varbinary(27)			select,insert,update,references	
 NULL	test1	tb2	f116	58	NULL	YES	varbinary	64	64	NULL	NULL	NULL	NULL	varbinary(64)			select,insert,update,references	
 NULL	test1	tb2	f117	59	NULL	YES	varbinary	192	192	NULL	NULL	NULL	NULL	varbinary(192)			select,insert,update,references	
-NULL	test1	tb2	f59	1	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f60	2	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f61	3	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f62	4	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f63	5	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f64	6	NULL	YES	decimal	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f59	1	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f60	2	NULL	YES	decimal unsigned	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f61	3	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f62	4	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f63	5	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f64	6	NULL	YES	decimal unsigned zerofill	NULL	NULL	64	0	NULL	NULL	decimal(64,0) unsigned zerofill			select,insert,update,references	
 NULL	test1	tb2	f65	7	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0)			select,insert,update,references	
 NULL	test1	tb2	f66	8	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30)			select,insert,update,references	
-NULL	test1	tb2	f67	9	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
-NULL	test1	tb2	f68	10	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
-NULL	test1	tb2	f69	11	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f70	12	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f71	13	NULL	YES	decimal	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
-NULL	test1	tb2	f72	14	NULL	YES	decimal	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f67	9	NULL	YES	decimal unsigned	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned			select,insert,update,references	
+NULL	test1	tb2	f68	10	NULL	YES	decimal unsigned	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned			select,insert,update,references	
+NULL	test1	tb2	f69	11	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f70	12	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f71	13	NULL	YES	decimal unsigned zerofill	NULL	NULL	10	0	NULL	NULL	decimal(10,0) unsigned zerofill			select,insert,update,references	
+NULL	test1	tb2	f72	14	NULL	YES	decimal unsigned zerofill	NULL	NULL	63	30	NULL	NULL	decimal(63,30) unsigned zerofill			select,insert,update,references	
 NULL	test1	tb2	f73	15	NULL	YES	double	NULL	NULL	22	NULL	NULL	NULL	double			select,insert,update,references	
 NULL	test1	tb2	f74	16	NULL	YES	double unsigned	NULL	NULL	22	NULL	NULL	NULL	double unsigned			select,insert,update,references	
 NULL	test1	tb2	f75	17	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	NULL	double unsigned zerofill			select,insert,update,references	
@@ -812,10 +812,14 @@ AND CHARACTER_OCTET_LENGTH / CHARACTER_M
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 NULL	bigint	NULL	NULL
+NULL	bigint unsigned	NULL	NULL
+NULL	bigint unsigned zerofill	NULL	NULL
 NULL	bit	NULL	NULL
 NULL	date	NULL	NULL
 NULL	datetime	NULL	NULL
 NULL	decimal	NULL	NULL
+NULL	decimal unsigned	NULL	NULL
+NULL	decimal unsigned zerofill	NULL	NULL
 NULL	double	NULL	NULL
 NULL	double unsigned	NULL	NULL
 NULL	double unsigned zerofill	NULL	NULL
@@ -823,11 +827,19 @@ NULL	float	NULL	NULL
 NULL	float unsigned	NULL	NULL
 NULL	float unsigned zerofill	NULL	NULL
 NULL	int	NULL	NULL
+NULL	int unsigned	NULL	NULL
+NULL	int unsigned zerofill	NULL	NULL
 NULL	mediumint	NULL	NULL
+NULL	mediumint unsigned	NULL	NULL
+NULL	mediumint unsigned zerofill	NULL	NULL
 NULL	smallint	NULL	NULL
+NULL	smallint unsigned	NULL	NULL
+NULL	smallint unsigned zerofill	NULL	NULL
 NULL	time	NULL	NULL
 NULL	timestamp	NULL	NULL
 NULL	tinyint	NULL	NULL
+NULL	tinyint unsigned	NULL	NULL
+NULL	tinyint unsigned zerofill	NULL	NULL
 NULL	year	NULL	NULL
 NULL	varchar	latin1	latin1_bin
 --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values
@@ -903,65 +915,65 @@ NULL	test	t9	f3	int	NULL	NULL	NULL	NULL	
 1.0000	test	tb1	f11	longblob	4294967295	4294967295	NULL	NULL	longblob
 1.0000	test	tb1	f12	binary	1	1	NULL	NULL	binary(1)
 NULL	test	tb1	f13	tinyint	NULL	NULL	NULL	NULL	tinyint(4)
-NULL	test	tb1	f14	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned
-NULL	test	tb1	f15	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
-NULL	test	tb1	f16	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb1	f14	tinyint unsigned	NULL	NULL	NULL	NULL	tinyint(3) unsigned
+NULL	test	tb1	f15	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb1	f16	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
 NULL	test	tb1	f17	smallint	NULL	NULL	NULL	NULL	smallint(6)
-NULL	test	tb1	f18	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-NULL	test	tb1	f19	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
-NULL	test	tb1	f20	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb1	f18	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	test	tb1	f19	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb1	f20	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
 NULL	test	tb1	f21	mediumint	NULL	NULL	NULL	NULL	mediumint(9)
-NULL	test	tb1	f22	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned
-NULL	test	tb1	f23	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
-NULL	test	tb1	f24	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb1	f22	mediumint unsigned	NULL	NULL	NULL	NULL	mediumint(8) unsigned
+NULL	test	tb1	f23	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb1	f24	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
 NULL	test	tb1	f25	int	NULL	NULL	NULL	NULL	int(11)
-NULL	test	tb1	f26	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	test	tb1	f27	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
-NULL	test	tb1	f28	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb1	f26	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	test	tb1	f27	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb1	f28	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
 NULL	test	tb1	f29	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	test	tb1	f30	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	test	tb1	f31	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
-NULL	test	tb1	f32	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb1	f30	bigint unsigned	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	test	tb1	f31	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb1	f32	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
 NULL	test	tb1	f33	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb1	f34	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f35	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f36	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f34	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f35	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f36	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb1	f37	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f38	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb1	f39	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f40	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb1	f41	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f42	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb1	f43	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f44	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb1	f39	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f40	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb1	f41	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f42	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb1	f43	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f44	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb1	f45	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f46	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb1	f47	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f48	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb1	f49	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f50	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb1	f51	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f52	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb1	f47	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f48	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb1	f49	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f50	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb1	f51	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f52	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb1	f53	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb1	f54	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb1	f55	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb1	f56	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f54	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb1	f55	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb1	f56	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb1	f57	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb1	f58	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb2	f59	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb2	f60	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb2	f61	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f62	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb2	f63	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f64	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb2	f59	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb2	f60	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb2	f61	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f62	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb2	f63	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f64	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb2	f65	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb2	f66	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb2	f67	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb2	f68	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb2	f69	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f70	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb2	f71	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb2	f72	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb2	f67	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb2	f68	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb2	f69	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f70	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb2	f71	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb2	f72	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb2	f73	double	NULL	NULL	NULL	NULL	double
 NULL	test	tb2	f74	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test	tb2	f75	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill
@@ -1020,65 +1032,65 @@ NULL	test	tb2	f107	year	NULL	NULL	NULL	N
 1.0000	test	tb3	f128	longblob	4294967295	4294967295	NULL	NULL	longblob
 1.0000	test	tb3	f129	binary	1	1	NULL	NULL	binary(1)
 NULL	test	tb3	f130	tinyint	NULL	NULL	NULL	NULL	tinyint(4)
-NULL	test	tb3	f131	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned
-NULL	test	tb3	f132	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
-NULL	test	tb3	f133	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb3	f131	tinyint unsigned	NULL	NULL	NULL	NULL	tinyint(3) unsigned
+NULL	test	tb3	f132	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
+NULL	test	tb3	f133	tinyint unsigned zerofill	NULL	NULL	NULL	NULL	tinyint(3) unsigned zerofill
 NULL	test	tb3	f134	smallint	NULL	NULL	NULL	NULL	smallint(6)
-NULL	test	tb3	f135	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
-NULL	test	tb3	f136	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
-NULL	test	tb3	f137	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb3	f135	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	test	tb3	f136	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
+NULL	test	tb3	f137	smallint unsigned zerofill	NULL	NULL	NULL	NULL	smallint(5) unsigned zerofill
 NULL	test	tb3	f138	mediumint	NULL	NULL	NULL	NULL	mediumint(9)
-NULL	test	tb3	f139	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned
-NULL	test	tb3	f140	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
-NULL	test	tb3	f141	mediumint	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb3	f139	mediumint unsigned	NULL	NULL	NULL	NULL	mediumint(8) unsigned
+NULL	test	tb3	f140	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
+NULL	test	tb3	f141	mediumint unsigned zerofill	NULL	NULL	NULL	NULL	mediumint(8) unsigned zerofill
 NULL	test	tb3	f142	int	NULL	NULL	NULL	NULL	int(11)
-NULL	test	tb3	f143	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	test	tb3	f144	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
-NULL	test	tb3	f145	int	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb3	f143	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	test	tb3	f144	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
+NULL	test	tb3	f145	int unsigned zerofill	NULL	NULL	NULL	NULL	int(10) unsigned zerofill
 NULL	test	tb3	f146	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	test	tb3	f147	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	test	tb3	f148	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
-NULL	test	tb3	f149	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb3	f147	bigint unsigned	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	test	tb3	f148	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
+NULL	test	tb3	f149	bigint unsigned zerofill	NULL	NULL	NULL	NULL	bigint(20) unsigned zerofill
 NULL	test	tb3	f150	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb3	f151	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f152	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f153	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f151	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f152	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f153	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb3	f154	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f155	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb3	f156	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f157	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb3	f158	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f159	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb3	f160	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f161	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb3	f156	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f157	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb3	f158	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f159	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb3	f160	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f161	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb3	f162	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f163	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb3	f164	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f165	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb3	f166	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f167	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb3	f168	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f169	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb3	f164	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f165	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb3	f166	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f167	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb3	f168	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f169	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb3	f170	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
-NULL	test	tb3	f171	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb3	f172	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb3	f173	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f171	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb3	f172	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb3	f173	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
 NULL	test	tb3	f174	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb3	f175	decimal	NULL	NULL	NULL	NULL	decimal(64,0)
-NULL	test	tb4	f176	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb4	f177	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test	tb4	f178	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f179	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test	tb4	f180	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f181	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb4	f176	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb4	f177	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test	tb4	f178	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f179	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test	tb4	f180	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f181	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test	tb4	f182	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test	tb4	f183	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test	tb4	f184	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test	tb4	f185	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test	tb4	f186	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f187	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test	tb4	f188	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test	tb4	f189	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb4	f184	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test	tb4	f185	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test	tb4	f186	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f187	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test	tb4	f188	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test	tb4	f189	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test	tb4	f190	double	NULL	NULL	NULL	NULL	double
 NULL	test	tb4	f191	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test	tb4	f192	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill
@@ -1132,20 +1144,20 @@ NULL	test	tb4	f238	varchar	0	0	latin1	la
 1.0000	test	tb4	f240	varchar	120	120	latin1	latin1_swedish_ci	varchar(120)
 1.0000	test	tb4	f241	char	100	100	latin1	latin1_swedish_ci	char(100)
 NULL	test	tb4	f242	bit	NULL	NULL	NULL	NULL	bit(30)
-NULL	test1	tb2	f59	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test1	tb2	f60	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
-NULL	test1	tb2	f61	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f62	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
-NULL	test1	tb2	f63	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f64	decimal	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test1	tb2	f59	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test1	tb2	f60	decimal unsigned	NULL	NULL	NULL	NULL	decimal(64,0) unsigned
+NULL	test1	tb2	f61	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f62	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
+NULL	test1	tb2	f63	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f64	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(64,0) unsigned zerofill
 NULL	test1	tb2	f65	decimal	NULL	NULL	NULL	NULL	decimal(10,0)
 NULL	test1	tb2	f66	decimal	NULL	NULL	NULL	NULL	decimal(63,30)
-NULL	test1	tb2	f67	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
-NULL	test1	tb2	f68	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
-NULL	test1	tb2	f69	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f70	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
-NULL	test1	tb2	f71	decimal	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
-NULL	test1	tb2	f72	decimal	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test1	tb2	f67	decimal unsigned	NULL	NULL	NULL	NULL	decimal(10,0) unsigned
+NULL	test1	tb2	f68	decimal unsigned	NULL	NULL	NULL	NULL	decimal(63,30) unsigned
+NULL	test1	tb2	f69	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f70	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
+NULL	test1	tb2	f71	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(10,0) unsigned zerofill
+NULL	test1	tb2	f72	decimal unsigned zerofill	NULL	NULL	NULL	NULL	decimal(63,30) unsigned zerofill
 NULL	test1	tb2	f73	double	NULL	NULL	NULL	NULL	double
 NULL	test1	tb2	f74	double unsigned	NULL	NULL	NULL	NULL	double unsigned
 NULL	test1	tb2	f75	double unsigned zerofill	NULL	NULL	NULL	NULL	double unsigned zerofill

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2008-03-07 16:33:07 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2009-02-24 11:58:16 +0000
@@ -33,18 +33,18 @@ NULL	mysql	func	dl	3		NO	char	128	384	NU
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
-NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
+NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
-NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
 NULL	mysql	help_category	url	4	NULL	NO	char	128	384	NULL	NULL	utf8	utf8_general_ci	char(128)			select,insert,update,references	
-NULL	mysql	help_keyword	help_keyword_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
+NULL	mysql	help_keyword	help_keyword_id	1	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_keyword	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
-NULL	mysql	help_relation	help_keyword_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
-NULL	mysql	help_relation	help_topic_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
+NULL	mysql	help_relation	help_keyword_id	2	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
+NULL	mysql	help_relation	help_topic_id	1	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_topic	description	4	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_general_ci	text			select,insert,update,references	
 NULL	mysql	help_topic	example	5	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_general_ci	text			select,insert,update,references	
-NULL	mysql	help_topic	help_category_id	3	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
-NULL	mysql	help_topic	help_topic_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
+NULL	mysql	help_topic	help_category_id	3	NULL	NO	smallint unsigned	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
+NULL	mysql	help_topic	help_topic_id	1	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_topic	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_topic	url	6	NULL	NO	char	128	384	NULL	NULL	utf8	utf8_general_ci	char(128)			select,insert,update,references	
 NULL	mysql	host	Alter_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -98,20 +98,20 @@ NULL	mysql	tables_priv	Table_name	4		NO	
 NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
 NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
-NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
+NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
 NULL	mysql	time_zone_leap_second	Correction	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 NULL	mysql	time_zone_leap_second	Transition_time	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)	PRI		select,insert,update,references	
 NULL	mysql	time_zone_name	Name	1	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
-NULL	mysql	time_zone_name	Time_zone_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-NULL	mysql	time_zone_transition	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
+NULL	mysql	time_zone_name	Time_zone_id	2	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	mysql	time_zone_transition	Time_zone_id	1	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 NULL	mysql	time_zone_transition	Transition_time	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)	PRI		select,insert,update,references	
-NULL	mysql	time_zone_transition	Transition_type_id	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+NULL	mysql	time_zone_transition	Transition_type_id	3	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
 NULL	mysql	time_zone_transition_type	Abbreviation	5		NO	char	8	24	NULL	NULL	utf8	utf8_general_ci	char(8)			select,insert,update,references	
-NULL	mysql	time_zone_transition_type	Is_DST	4	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
+NULL	mysql	time_zone_transition_type	Is_DST	4	0	NO	tinyint unsigned	NULL	NULL	3	0	NULL	NULL	tinyint(3) unsigned			select,insert,update,references	
 NULL	mysql	time_zone_transition_type	Offset	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-NULL	mysql	time_zone_transition_type	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
-NULL	mysql	time_zone_transition_type	Transition_type_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
+NULL	mysql	time_zone_transition_type	Time_zone_id	1	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
+NULL	mysql	time_zone_transition_type	Transition_type_id	2	NULL	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 NULL	mysql	user	Alter_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_priv	8	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -128,10 +128,10 @@ NULL	mysql	user	Host	1		NO	char	60	180	N
 NULL	mysql	user	Index_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Insert_priv	5	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Lock_tables_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	36	0	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_questions	34	0	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	35	0	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	37	0	NO	int unsigned	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	mysql	user	Password	3		NO	char	41	41	NULL	NULL	latin1	latin1_bin	char(41)			select,insert,update,references	
 NULL	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -193,9 +193,11 @@ ORDER BY CHARACTER_SET_NAME, COLLATION_N
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 NULL	bigint	NULL	NULL
 NULL	int	NULL	NULL
-NULL	smallint	NULL	NULL
+NULL	int unsigned	NULL	NULL
+NULL	smallint unsigned	NULL	NULL
 NULL	timestamp	NULL	NULL
 NULL	tinyint	NULL	NULL
+NULL	tinyint unsigned	NULL	NULL
 --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values
 --> are 0, which is intended behavior, and the result of 0 / 0 IS NULL
 SELECT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -243,17 +245,17 @@ NULL	mysql	columns_priv	Timestamp	timest
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
-NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	mysql	help_category	help_category_id	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	mysql	help_category	parent_category_id	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	url	char	128	384	utf8	utf8_general_ci	char(128)
-NULL	mysql	help_keyword	help_keyword_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	help_keyword	help_keyword_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	help_keyword	name	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	help_relation	help_topic_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	help_relation	help_keyword_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	help_topic	help_topic_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	help_relation	help_topic_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	help_relation	help_keyword_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	help_topic	help_topic_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	help_topic	name	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
+NULL	mysql	help_topic	help_category_id	smallint unsigned	NULL	NULL	NULL	NULL	smallint(5) unsigned
 1.0000	mysql	help_topic	description	text	65535	65535	utf8	utf8_general_ci	text
 1.0000	mysql	help_topic	example	text	65535	65535	utf8	utf8_general_ci	text
 3.0000	mysql	help_topic	url	char	128	384	utf8	utf8_general_ci	char(128)
@@ -308,19 +310,19 @@ NULL	mysql	procs_priv	Timestamp	timestam
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
-NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	time_zone	Time_zone_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
 NULL	mysql	time_zone_leap_second	Transition_time	bigint	NULL	NULL	NULL	NULL	bigint(20)
 NULL	mysql	time_zone_leap_second	Correction	int	NULL	NULL	NULL	NULL	int(11)
 3.0000	mysql	time_zone_name	Name	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	time_zone_name	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	time_zone_transition	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	time_zone_name	Time_zone_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	time_zone_transition	Time_zone_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	time_zone_transition	Transition_time	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	mysql	time_zone_transition	Transition_type_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	time_zone_transition_type	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	time_zone_transition_type	Transition_type_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	time_zone_transition	Transition_type_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	time_zone_transition_type	Time_zone_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	time_zone_transition_type	Transition_type_id	int unsigned	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	time_zone_transition_type	Offset	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(3) unsigned
+NULL	mysql	time_zone_transition_type	Is_DST	tinyint unsigned	NULL	NULL	NULL	NULL	tinyint(3) unsigned
 3.0000	mysql	time_zone_transition_type	Abbreviation	char	8	24	utf8	utf8_general_ci	char(8)
 3.0000	mysql	user	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	user	User	char	16	48	utf8	utf8_bin	char(16)
@@ -355,7 +357,7 @@ NULL	mysql	time_zone_transition_type	Is_
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_subject	blob	65535	65535	NULL	NULL	blob
-NULL	mysql	user	max_questions	int	NULL	NULL	NULL	NULL	int(11) unsigned
-NULL	mysql	user	max_updates	int	NULL	NULL	NULL	NULL	int(11) unsigned
-NULL	mysql	user	max_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
-NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
+NULL	mysql	user	max_questions	int unsigned	NULL	NULL	NULL	NULL	int(11) unsigned
+NULL	mysql	user	max_updates	int unsigned	NULL	NULL	NULL	NULL	int(11) unsigned
+NULL	mysql	user	max_connections	int unsigned	NULL	NULL	NULL	NULL	int(11) unsigned
+NULL	mysql	user	max_user_connections	int unsigned	NULL	NULL	NULL	NULL	int(11) unsigned

=== modified file 'mysql-test/t/information_schema.test'
--- a/mysql-test/t/information_schema.test	2009-02-09 20:52:40 +0000
+++ b/mysql-test/t/information_schema.test	2009-02-24 11:58:16 +0000
@@ -1146,5 +1146,23 @@ DROP TABLE test.t1;
 SET max_heap_table_size = DEFAULT;
 USE test;
 
+#
+# Bug#42758 INFORMATION_SCHEMA.COLUMNS is inconsistent
+#
+create table t1(
+tiny_uns tinyint unsigned,
+small_uns smallint unsigned,
+medium_uns mediumint unsigned,
+int_col_uns int unsigned,
+big_uns bigint unsigned,
+decimal_uns decimal(10,5) unsigned,
+fcol_uns float unsigned,
+dcol_uns double unsigned,
+enum_col enum(')','('));
+
+select COLUMN_NAME, DATA_TYPE,COLUMN_TYPE from INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_NAME='t1';
+drop table t1;
+
 --echo End of 5.0 tests.
 

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2009-02-17 14:22:48 +0000
+++ b/sql/sql_show.cc	2009-02-24 11:58:16 +0000
@@ -2751,9 +2751,26 @@ static int get_schema_column_record(THD 
     field->sql_type(type);
     table->field[14]->store(type.ptr(), type.length(), cs);		
     tmp_buff= strchr(type.ptr(), '(');
-    table->field[7]->store(type.ptr(),
-                           (tmp_buff ? tmp_buff - type.ptr() :
-                            type.length()), cs);
+    if (tmp_buff)
+    {
+      const char *tmp_buff_end= strrchr(type.ptr(), ')');
+      if (type.length() > tmp_buff_end - type.ptr())
+      {
+        char buff[MAX_FIELD_WIDTH];
+        String clean_type(buff,sizeof(buff), system_charset_info);
+        clean_type.length(0);
+        clean_type.append(type.ptr(), tmp_buff - type.ptr(), cs);
+        clean_type.append(tmp_buff_end + 1, 
+                          type.length() - (tmp_buff_end - type.ptr()) - 1,
+                          cs);
+        table->field[7]->store(clean_type.ptr(),
+                               clean_type.length(), cs);
+      }
+      else
+        table->field[7]->store(type.ptr(), tmp_buff - type.ptr(), cs);
+    }
+    else
+      table->field[7]->store(type.ptr(), type.length(), cs);
 
     if (get_field_default_value(thd, show_table, field, &type, 0))
     {


Attachment: [text/bzr-bundle] bzr/sergey.glukhov@sun.com-20090224115816-6gtlx6p7mru7e1do.bundle
Thread
bzr commit into mysql-5.0-bugteam branch (Sergey.Glukhov:2755)Bug#42758Sergey Glukhov24 Feb