Some collation have been renamed to fit into convension

mysql-test/r/alter_table.result

@@ -53,7 +53,7 @@ SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 GROUP_ID	int(10) unsigned	binary		PRI	0		select,insert,update,references	
 LANG_ID	smallint(5) unsigned	binary		PRI	0		select,insert,update,references	
-NAME	char(80)	latin1		MUL			select,insert,update,references	
+NAME	char(80)	latin1_swedish_ci		MUL			select,insert,update,references	
 DROP TABLE t1;
 create table t1 (n int);
 insert into t1 values(9),(3),(12),(10);
@@ -120,5 +120,5 @@ alter table t2 rename t1, add c char(10) comment "no comment";
 show columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra
 i	int(10) unsigned	binary		PRI	NULL	auto_increment
-c	char(10)	latin1	YES		NULL	
+c	char(10)	latin1_swedish_ci	YES		NULL	
 drop table t1;

mysql-test/r/create.result

@@ -85,17 +85,17 @@ create table t1(x varchar(50) );
 create table t2 select x from t1 where 1=2;
 describe t1;
 Field	Type	Collation	Null	Key	Default	Extra
-x	varchar(50)	latin1	YES		NULL	
+x	varchar(50)	latin1_swedish_ci	YES		NULL	
 describe t2;
 Field	Type	Collation	Null	Key	Default	Extra
-x	char(50)	latin1	YES		NULL	
+x	char(50)	latin1_swedish_ci	YES		NULL	
 drop table t2;
 create table t2 select now() as a , curtime() as b, curdate() as c , 1+1 as d , 1.0 + 1 as e , 33333333333333333 + 3 as f;
 describe t2;
 Field	Type	Collation	Null	Key	Default	Extra
-a	datetime	latin1			0000-00-00 00:00:00	
-b	time	latin1			00:00:00	
-c	date	latin1			0000-00-00	
+a	datetime	latin1_swedish_ci			0000-00-00 00:00:00	
+b	time	latin1_swedish_ci			00:00:00	
+c	date	latin1_swedish_ci			0000-00-00	
 d	bigint(17)	binary			0	
 e	double(18,1)	binary			0.0	
 f	bigint(17)	binary			0	
@@ -103,9 +103,9 @@ drop table t2;
 create table t2 select CAST("2001-12-29" AS DATE) as d, CAST("20:45:11" AS TIME) as t, CAST("2001-12-29  20:45:11" AS DATETIME) as dt;
 describe t2;
 Field	Type	Collation	Null	Key	Default	Extra
-d	date	latin1			0000-00-00	
-t	time	latin1			00:00:00	
-dt	datetime	latin1			0000-00-00 00:00:00	
+d	date	latin1_swedish_ci			0000-00-00	
+t	time	latin1_swedish_ci			00:00:00	
+dt	datetime	latin1_swedish_ci			0000-00-00 00:00:00	
 drop table t1,t2;
 create table t1 (a tinyint);
 create table t2 (a int) select * from t1;

mysql-test/r/ctype_collate.result

@@ -6,7 +6,7 @@ latin1_f CHAR(32) CHARACTER SET latin1 NOT NULL
 CREATE TABLE t2 (
 latin1_f CHAR(32) CHARACTER SET latin1 COLLATE koi8r NOT NULL
 );
-COLLATION 'koi8r' is not valid for CHARACTER SET 'latin1'
+COLLATION 'koi8r_general_ci' is not valid for CHARACTER SET 'latin1'
 INSERT INTO t1 (latin1_f) VALUES (_latin1'A');
 INSERT INTO t1 (latin1_f) VALUES (_latin1'a');
 INSERT INTO t1 (latin1_f) VALUES (_latin1'AD');
@@ -490,7 +490,7 @@ t1	CREATE TABLE `t1` (
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM  t1;
 Field	Type	Collation	Null	Key	Default	Extra
-latin1_f	char(32)	latin1				
+latin1_f	char(32)	latin1_swedish_ci				
 ALTER TABLE t1 CHANGE latin1_f 
 latin1_f CHAR(32) CHARACTER SET latin1 COLLATE latin1_bin;
 SHOW CREATE TABLE t1;
@@ -513,17 +513,17 @@ latin1_f	char(32)	latin1_bin	YES		NULL
 SET NAMES 'latin1';
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
-client_collation	latin1
+client_collation	latin1_swedish_ci
 SET NAMES latin1;
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
-client_collation	latin1
+client_collation	latin1_swedish_ci
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
-client_collation	latin1
+client_collation	latin1_swedish_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
-latin1	latin1	3	1
+latin1	latin1_swedish_ci	3	1
 SET NAMES latin1 COLLATE latin1_bin;
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
@@ -542,33 +542,33 @@ latin1	latin1_bin	3	0
 SET NAMES koi8r;
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
-client_collation	koi8r
+client_collation	koi8r_general_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
-latin1	latin1	3	1
+latin1	latin1_swedish_ci	3	1
 SET COLLATION koi8r_bin;
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
 client_collation	koi8r_bin
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
-latin1	latin1	3	1
+latin1	latin1_swedish_ci	3	1
 SET COLLATION DEFAULT;
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
-client_collation	koi8r
+client_collation	koi8r_general_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
-latin1	latin1	3	1
+latin1	latin1_swedish_ci	3	1
 SET NAMES DEFAULT;
 SHOW VARIABLES LIKE 'client_collation';
 Variable_name	Value
-client_collation	latin1
+client_collation	latin1_swedish_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
-latin1	latin1	3	1
+latin1	latin1_swedish_ci	3	1
 SET NAMES latin1 COLLATE koi8r;
-COLLATION 'koi8r' is not valid for CHARACTER SET 'latin1'
+COLLATION 'koi8r_general_ci' is not valid for CHARACTER SET 'latin1'
 SET NAMES 'DEFAULT';
 Unknown character set: 'DEFAULT'
 DROP TABLE t1;

mysql-test/r/ctype_recoding.result

@@ -14,7 +14,7 @@ Table	Create Table
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
 Field	Type	Collation	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(32) character set koi8r	koi8r				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(32) character set koi8r	koi8r_general_ci				
 SET NAMES cp1251;
 SHOW TABLES;
 Tables_in_test
@@ -26,7 +26,7 @@ Table	Create Table
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
 Field	Type	Collation	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(32) character set koi8r	koi8r				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(32) character set koi8r	koi8r_general_ci				
 SET NAMES utf8;
 SHOW TABLES;
 Tables_in_test
@@ -38,6 +38,6 @@ Table	Create Table
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM таблица;
 Field	Type	Collation	Null	Key	Default	Extra
-поле	char(32) character set koi8r	koi8r				
+поле	char(32) character set koi8r	koi8r_general_ci				
 SET NAMES koi8r;
 DROP TABLE <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;

mysql-test/r/select.result

@@ -3221,17 +3221,17 @@ Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 auto	int(11)	binary		PRI	NULL	auto_increment	select,insert,update,references	
 fld1	int(6) unsigned zerofill	binary		UNI	000000		select,insert,update,references	
 companynr	tinyint(2) unsigned zerofill	binary			00		select,insert,update,references	
-fld3	char(30)	latin1		MUL			select,insert,update,references	
-fld4	char(35)	latin1					select,insert,update,references	
-fld5	char(35)	latin1					select,insert,update,references	
-fld6	char(4)	latin1					select,insert,update,references	
+fld3	char(30)	latin1_swedish_ci		MUL			select,insert,update,references	
+fld4	char(35)	latin1_swedish_ci					select,insert,update,references	
+fld5	char(35)	latin1_swedish_ci					select,insert,update,references	
+fld6	char(4)	latin1_swedish_ci					select,insert,update,references	
 show full columns from t2 from test like 'f%';
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 fld1	int(6) unsigned zerofill	binary		UNI	000000		select,insert,update,references	
-fld3	char(30)	latin1		MUL			select,insert,update,references	
-fld4	char(35)	latin1					select,insert,update,references	
-fld5	char(35)	latin1					select,insert,update,references	
-fld6	char(4)	latin1					select,insert,update,references	
+fld3	char(30)	latin1_swedish_ci		MUL			select,insert,update,references	
+fld4	char(35)	latin1_swedish_ci					select,insert,update,references	
+fld5	char(35)	latin1_swedish_ci					select,insert,update,references	
+fld6	char(4)	latin1_swedish_ci					select,insert,update,references	
 show full columns from t2 from test like 's%';
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 show keys from t2;

mysql-test/r/show_check.result

@@ -99,8 +99,8 @@ t1	CREATE TABLE `t1` (
 ) TYPE=MyISAM CHARSET=latin1 COMMENT='it''s a table'
 show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-test_set	set('val1','val2','val3')	latin1					select,insert,update,references	
-name	char(20)	latin1	YES		O'Brien		select,insert,update,references	O'Brien as default
+test_set	set('val1','val2','val3')	latin1_swedish_ci					select,insert,update,references	
+name	char(20)	latin1_swedish_ci	YES		O'Brien		select,insert,update,references	O'Brien as default
 c	int(11)	binary			0		select,insert,update,references	int column
 drop table t1;
 create table t1 (a int not null, unique aa (a));

mysql-test/r/type_blob.result

@@ -3,10 +3,10 @@ CREATE TABLE t1 (a blob, b text, c blob(250), d text(70000), e text(70000000));
 show columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra
 a	blob	binary	YES		NULL	
-b	text	latin1	YES		NULL	
+b	text	latin1_swedish_ci	YES		NULL	
 c	blob	binary	YES		NULL	
-d	mediumtext	latin1	YES		NULL	
-e	longtext	latin1	YES		NULL	
+d	mediumtext	latin1_swedish_ci	YES		NULL	
+e	longtext	latin1_swedish_ci	YES		NULL	
 CREATE TABLE t2 (a char(257), b varchar(70000) binary, c varchar(70000000));
 Warnings:
 Warning	1244	Converting column 'a' from CHAR to TEXT
@@ -14,9 +14,9 @@ Warning	1244	Converting column 'b' from CHAR to BLOB
 Warning	1244	Converting column 'c' from CHAR to TEXT
 show columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra
-a	text	latin1	YES		NULL	
+a	text	latin1_swedish_ci	YES		NULL	
 b	mediumblob	binary	YES		NULL	
-c	longtext	latin1	YES		NULL	
+c	longtext	latin1_swedish_ci	YES		NULL	
 create table t3 (a long, b long byte);
 show create TABLE t3;
 Table	Create Table
@@ -70,15 +70,15 @@ update t1 set c="",b=null where c="1";
 lock tables t1 READ;
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-t	text	latin1	YES		NULL		select,insert,update,references	
-c	varchar(10)	latin1	YES		NULL		select,insert,update,references	
+t	text	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+c	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 b	blob	binary	YES		NULL		select,insert,update,references	
 d	varchar(10) binary	binary	YES		NULL		select,insert,update,references	
 lock tables t1 WRITE;
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-t	text	latin1	YES		NULL		select,insert,update,references	
-c	varchar(10)	latin1	YES		NULL		select,insert,update,references	
+t	text	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+c	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 b	blob	binary	YES		NULL		select,insert,update,references	
 d	varchar(10) binary	binary	YES		NULL		select,insert,update,references	
 unlock tables;

mysql-test/r/type_ranges.result

@@ -40,7 +40,7 @@ KEY (options,flags)
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 auto	int(5) unsigned	binary		PRI	NULL	auto_increment	select,insert,update,references	
-string	varchar(10)	latin1	YES		hello		select,insert,update,references	
+string	varchar(10)	latin1_swedish_ci	YES		hello		select,insert,update,references	
 tiny	tinyint(4)	binary		MUL	0		select,insert,update,references	
 short	smallint(6)	binary		MUL	1		select,insert,update,references	
 medium	mediumint(8)	binary		MUL	0		select,insert,update,references	
@@ -53,16 +53,16 @@ ushort	smallint(5) unsigned zerofill	binary		MUL	00000		select,insert,update,ref
 umedium	mediumint(8) unsigned	binary		MUL	0		select,insert,update,references	
 ulong	int(11) unsigned	binary		MUL	0		select,insert,update,references	
 ulonglong	bigint(13) unsigned	binary		MUL	0		select,insert,update,references	
-time_stamp	timestamp	latin1	YES		NULL		select,insert,update,references	
-date_field	date	latin1	YES		NULL		select,insert,update,references	
-time_field	time	latin1	YES		NULL		select,insert,update,references	
-date_time	datetime	latin1	YES		NULL		select,insert,update,references	
+time_stamp	timestamp	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+date_field	date	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+time_field	time	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+date_time	datetime	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 blob_col	blob	binary	YES		NULL		select,insert,update,references	
 tinyblob_col	tinyblob	binary	YES		NULL		select,insert,update,references	
 mediumblob_col	mediumblob	binary					select,insert,update,references	
 longblob_col	longblob	binary					select,insert,update,references	
-options	enum('one','two','tree')	latin1		MUL	one		select,insert,update,references	
-flags	set('one','two','tree')	latin1					select,insert,update,references	
+options	enum('one','two','tree')	latin1_swedish_ci		MUL	one		select,insert,update,references	
+flags	set('one','two','tree')	latin1_swedish_ci					select,insert,update,references	
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	auto	A	0	NULL	NULL		BTREE	
@@ -170,7 +170,7 @@ update t2 set string="changed" where auto=16;
 show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 auto	int(5) unsigned	binary		MUL	NULL	auto_increment	select,insert,update,references	
-string	varchar(10)	latin1	YES		new defaul		select,insert,update,references	
+string	varchar(10)	latin1_swedish_ci	YES		new defaul		select,insert,update,references	
 tiny	tinyint(4)	binary		MUL	0		select,insert,update,references	
 short	smallint(6)	binary		MUL	0		select,insert,update,references	
 medium	mediumint(8)	binary		MUL	0		select,insert,update,references	
@@ -183,20 +183,20 @@ ushort	smallint(5) unsigned zerofill	binary			00000		select,insert,update,refere
 umedium	mediumint(8) unsigned	binary		MUL	0		select,insert,update,references	
 ulong	int(11) unsigned	binary		MUL	0		select,insert,update,references	
 ulonglong	bigint(13) unsigned	binary		MUL	0		select,insert,update,references	
-time_stamp	timestamp	latin1	YES		NULL		select,insert,update,references	
-date_field	varchar(10)	latin1	YES		NULL		select,insert,update,references	
-time_field	time	latin1	YES		NULL		select,insert,update,references	
-date_time	datetime	latin1	YES		NULL		select,insert,update,references	
-new_blob_col	varchar(20)	latin1	YES		NULL		select,insert,update,references	
+time_stamp	timestamp	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+date_field	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+time_field	time	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+date_time	datetime	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+new_blob_col	varchar(20)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 tinyblob_col	tinyblob	binary	YES		NULL		select,insert,update,references	
 mediumblob_col	mediumblob	binary					select,insert,update,references	
-options	enum('one','two','tree')	latin1		MUL	one		select,insert,update,references	
-flags	set('one','two','tree')	latin1					select,insert,update,references	
-new_field	varchar(10)	latin1			new		select,insert,update,references	
+options	enum('one','two','tree')	latin1_swedish_ci		MUL	one		select,insert,update,references	
+flags	set('one','two','tree')	latin1_swedish_ci					select,insert,update,references	
+new_field	varchar(10)	latin1_swedish_ci			new		select,insert,update,references	
 show full columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 auto	int(5) unsigned	binary			0		select,insert,update,references	
-string	varchar(10)	latin1	YES		new defaul		select,insert,update,references	
+string	varchar(10)	latin1_swedish_ci	YES		new defaul		select,insert,update,references	
 tiny	tinyint(4)	binary			0		select,insert,update,references	
 short	smallint(6)	binary			0		select,insert,update,references	
 medium	mediumint(8)	binary			0		select,insert,update,references	
@@ -209,16 +209,16 @@ ushort	smallint(5) unsigned zerofill	binary			00000		select,insert,update,refere
 umedium	mediumint(8) unsigned	binary			0		select,insert,update,references	
 ulong	int(11) unsigned	binary			0		select,insert,update,references	
 ulonglong	bigint(13) unsigned	binary			0		select,insert,update,references	
-time_stamp	timestamp	latin1	YES		NULL		select,insert,update,references	
-date_field	varchar(10)	latin1	YES		NULL		select,insert,update,references	
-time_field	time	latin1	YES		NULL		select,insert,update,references	
-date_time	datetime	latin1	YES		NULL		select,insert,update,references	
-new_blob_col	varchar(20)	latin1	YES		NULL		select,insert,update,references	
+time_stamp	timestamp	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+date_field	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+time_field	time	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+date_time	datetime	latin1_swedish_ci	YES		NULL		select,insert,update,references	
+new_blob_col	varchar(20)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 tinyblob_col	tinyblob	binary	YES		NULL		select,insert,update,references	
 mediumblob_col	mediumblob	binary					select,insert,update,references	
-options	enum('one','two','tree')	latin1			one		select,insert,update,references	
-flags	set('one','two','tree')	latin1					select,insert,update,references	
-new_field	varchar(10)	latin1			new		select,insert,update,references	
+options	enum('one','two','tree')	latin1_swedish_ci			one		select,insert,update,references	
+flags	set('one','two','tree')	latin1_swedish_ci					select,insert,update,references	
+new_field	varchar(10)	latin1_swedish_ci			new		select,insert,update,references	
 select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and ((t1.string<>t2.string and (t1.string is not null or t2.string is not null)) or (t1.tiny<>t2.tiny and (t1.tiny is not null or t2.tiny is not null)) or (t1.short<>t2.short and (t1.short is not null or t2.short is not null)) or (t1.medium<>t2.medium and (t1.medium is not null or t2.medium is not null)) or (t1.long_int<>t2.long_int and (t1.long_int is not null or t2.long_int is not null)) or (t1.longlong<>t2.longlong and (t1.longlong is not null or t2.longlong is not null)) or (t1.real_float<>t2.real_float and (t1.real_float is not null or t2.real_float is not null)) or (t1.real_double<>t2.real_double and (t1.real_double is not null or t2.real_double is not null)) or (t1.utiny<>t2.utiny and (t1.utiny is not null or t2.utiny is not null)) or (t1.ushort<>t2.ushort and (t1.ushort is not null or t2.ushort is not null)) or (t1.umedium<>t2.umedium and (t1.umedium is not null or t2.umedium is not null)) or (t1.ulong<>t2.ulong and (t1.ulong is not null or t2.ulong is not null)) or (t1.ulonglong<>t2.ulonglong and (t1.ulonglong is not null or t2.ulonglong is not null)) or (t1.time_stamp<>t2.time_stamp and (t1.time_stamp is not null or t2.time_stamp is not null)) or (t1.date_field<>t2.date_field and (t1.date_field is not null or t2.date_field is not null)) or (t1.time_field<>t2.time_field and (t1.time_field is not null or t2.time_field is not null)) or (t1.date_time<>t2.date_time and (t1.date_time is not null or t2.date_time is not null)) or (t1.new_blob_col<>t2.new_blob_col and (t1.new_blob_col is not null or t2.new_blob_col is not null)) or (t1.tinyblob_col<>t2.tinyblob_col and (t1.tinyblob_col is not null or t2.tinyblob_col is not null)) or (t1.mediumblob_col<>t2.mediumblob_col and (t1.mediumblob_col is not null or t2.mediumblob_col is not null)) or (t1.options<>t2.options and (t1.options is not null or t2.options is not null)) or (t1.flags<>t2.flags and (t1.flags is not null or t2.flags is not null)) or (t1.new_field<>t2.new_field and (t1.new_field is not null or t2.new_field is not null)));
 auto	auto
 16	16
@@ -231,8 +231,8 @@ show full columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 auto	bigint(17) unsigned	binary		PRI	0		select,insert,update,references	
 t1	bigint(1)	binary			0		select,insert,update,references	
-t2	char(1)	latin1					select,insert,update,references	
-t3	mediumtext	latin1					select,insert,update,references	
+t2	char(1)	latin1_swedish_ci					select,insert,update,references	
+t3	mediumtext	latin1_swedish_ci					select,insert,update,references	
 t4	mediumtext character set latin1	latin1_bin					select,insert,update,references	
 select * from t2;
 auto	t1	t2	t3	t4

mysql-test/r/variables.result

@@ -158,15 +158,15 @@ net_buffer_length	1048576
 set GLOBAL character set cp1251_koi8;
 show global variables like "client_collation";
 Variable_name	Value
-client_collation	cp1251
+client_collation	cp1251_bulgarian_ci
 set character set cp1251_koi8;
 show variables like "client_collation";
 Variable_name	Value
-client_collation	cp1251
+client_collation	cp1251_bulgarian_ci
 set global character set default, session character set default;
 show variables like "client_collation";
 Variable_name	Value
-client_collation	latin1
+client_collation	latin1_swedish_ci
 select @@timestamp>0;
 @@timestamp>0
 1