Bug#7219 information_schema: errors in "columns"

changed field names in 'collations' table(discussed with PGulutzan)


mysql-test/r/information_schema.result:
  result fix
mysql-test/t/information_schema.test:
  test for bug2719

1 files changed, 17 insertions, 11 deletions

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 0bd3ba14636..c9cb30f8365 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -172,7 +172,7 @@ CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
 latin1	latin1_swedish_ci	ISO 8859-1 West European	1
 select * from information_schema.COLLATIONS
 where COLLATION_NAME like 'latin1%';
-COLLATION_NAME	CHARSET	ID	DEFAULT	COMPILED	SORTLEN
+COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
 latin1_german1_ci	latin1	5			0
 latin1_swedish_ci	latin1	8	Yes	Yes	1
 latin1_danish_ci	latin1	15			0
@@ -192,7 +192,7 @@ latin1_general_ci	latin1	48			0
 latin1_general_cs	latin1	49			0
 latin1_spanish_ci	latin1	94			0
 SHOW COLLATION * LIKE 'latin1%';
-COLLATION_NAME	CHARSET	ID	DEFAULT	COMPILED	SORTLEN
+COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
 latin1_german1_ci	latin1	5			0
 latin1_swedish_ci	latin1	8	Yes	Yes	1
 latin1_danish_ci	latin1	15			0
@@ -222,7 +222,7 @@ latin1_general_ci
 latin1_general_cs
 latin1_spanish_ci
 SHOW COLLATION *  WHERE COLLATION_NAME like 'latin1%';
-COLLATION_NAME	CHARSET	ID	DEFAULT	COMPILED	SORTLEN
+COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
 latin1_german1_ci	latin1	5			0
 latin1_swedish_ci	latin1	8	Yes	Yes	1
 latin1_danish_ci	latin1	15			0
@@ -467,20 +467,20 @@ drop table t1;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 character_sets	CREATE TEMPORARY TABLE `character_sets` (
-  `CHARACTER_SET_NAME` varchar(30) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(60) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
   `DESCRIPTION` varchar(60) NOT NULL default '',
   `MAXLEN` bigint(3) NOT NULL default '0'
-) ENGINE=HEAP DEFAULT CHARSET=utf8 MAX_ROWS=2267
+) ENGINE=HEAP DEFAULT CHARSET=utf8 MAX_ROWS=1818
 set names latin2;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 character_sets	CREATE TEMPORARY TABLE `character_sets` (
-  `CHARACTER_SET_NAME` varchar(30) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(60) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
   `DESCRIPTION` varchar(60) NOT NULL default '',
   `MAXLEN` bigint(3) NOT NULL default '0'
-) ENGINE=HEAP DEFAULT CHARSET=utf8 MAX_ROWS=2267
+) ENGINE=HEAP DEFAULT CHARSET=utf8 MAX_ROWS=1818
 set names latin1;
 create table t1 select * from information_schema.CHARACTER_SETS
 where CHARACTER_SET_NAME like "latin1";
@@ -491,8 +491,8 @@ alter table t1 default character set utf8;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `CHARACTER_SET_NAME` varchar(30) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(60) NOT NULL default '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
   `DESCRIPTION` varchar(60) NOT NULL default '',
   `MAXLEN` bigint(3) NOT NULL default '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -641,3 +641,9 @@ drop view t3;
 drop table t4;
 select * from information_schema.table_names;
 ERROR 42S02: Unknown table 'table_names' in information_schema
+select column_type from information_schema.columns
+where table_schema="information_schema" and table_name="COLUMNS" and
+(column_name="character_set_name" or column_name="collation_name");
+column_type
+varchar(64)
+varchar(64)