Charset of any string field now can be specified during CREATE TABLE

mysql-test/r/alter_table.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/create.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/fulltext.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/innodb.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/merge.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/select.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/show_check.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/symlink.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/type_blob.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/type_ranges.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
sql/field.cc:
  New format for string fields in SHOW CREATE TABLE and SHOW FIELDS
sql/mysql_priv.h:
  pass charset
sql/sql_parse.cc:
  QQ is now fixed :)
sql/sql_yacc.yy:
  New format for string fields in SHOW CREATE TABLE and SHOW FIELDS

1 files changed, 5 insertions, 5 deletions

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 3766332cf39..1f83bc61cdc 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -94,13 +94,13 @@ show create table t1 ;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `test_set` set('val1','val2','val3') NOT NULL default '',
-  `name` char(20) default 'O''Brien' COMMENT 'O''Brien as default',
+  `name` char(20) character set latin1 default 'O''Brien' COMMENT 'O''Brien as default',
   `c` int(11) NOT NULL default '0' COMMENT 'int column'
 ) TYPE=MyISAM COMMENT='it''s a table'
 show full columns from t1;
 Field	Type	Null	Key	Default	Extra	Privileges	Comment
 test_set	set('val1','val2','val3')					select,insert,update,references	
-name	char(20)	YES		O'Brien		select,insert,update,references	O'Brien as default
+name	char(20) character set latin1	YES		O'Brien		select,insert,update,references	O'Brien as default
 c	int(11)			0		select,insert,update,references	int column
 drop table t1;
 create table t1 (a int not null, unique aa (a));
@@ -133,7 +133,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0',
-  `b` char(10) default NULL,
+  `b` char(10) character set latin1 default NULL,
   KEY `b` (`b`)
 ) TYPE=MyISAM MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test'
 alter table t1 MAX_ROWS=200 ROW_FORMAT=dynamic PACK_KEYS=0;
@@ -141,7 +141,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0',
-  `b` varchar(10) default NULL,
+  `b` varchar(10) character set latin1 default NULL,
   KEY `b` (`b`)
 ) TYPE=MyISAM MIN_ROWS=10 MAX_ROWS=200 AVG_ROW_LENGTH=10 PACK_KEYS=0 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='test'
 ALTER TABLE t1 AVG_ROW_LENGTH=0 CHECKSUM=0 COMMENT="" MIN_ROWS=0 MAX_ROWS=0 PACK_KEYS=DEFAULT DELAY_KEY_WRITE=0 ROW_FORMAT=default;
@@ -149,7 +149,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0',
-  `b` varchar(10) default NULL,
+  `b` varchar(10) character set latin1 default NULL,
   KEY `b` (`b`)
 ) TYPE=MyISAM
 drop table t1;