SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:

Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types


mysql-test/r/alter_table.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/create.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/ctype_collate.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/ctype_recoding.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/gis.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/innodb.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/select.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/show_check.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/type_blob.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/type_float.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/type_ranges.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
sql/field.cc:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
sql/field.h:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
sql/sql_show.cc:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result
index 815445150cd..fb9e8224111 100644
--- a/mysql-test/r/ctype_recoding.result
+++ b/mysql-test/r/ctype_recoding.result
@@ -14,7 +14,7 @@ Table	Create Table
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM ÔÁÂÌÉÃÁ;
 Field	Type	Collation	Null	Key	Default	Extra
-ÐÏÌÅ	char(32) character set koi8r	koi8r_general_ci				
+ÐÏÌÅ	char(32)	koi8r_general_ci				
 SET CHARACTER SET cp1251;
 SHOW TABLES;
 Tables_in_test
@@ -26,7 +26,7 @@ Table	Create Table
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM òàáëèöà;
 Field	Type	Collation	Null	Key	Default	Extra
-ïîëå	char(32) character set koi8r	koi8r_general_ci				
+ïîëå	char(32)	koi8r_general_ci				
 SET CHARACTER SET utf8;
 SHOW TABLES;
 Tables_in_test
@@ -38,7 +38,7 @@ Table	Create Table
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM таблица;
 Field	Type	Collation	Null	Key	Default	Extra
-поле	char(32) character set koi8r	koi8r_general_ci				
+поле	char(32)	koi8r_general_ci				
 SET CHARACTER SET koi8r;
 DROP TABLE ÔÁÂÌÉÃÁ;
 SET CHARACTER SET default;