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 ;
 Field	Type	Collation	Null	Key	Default	Extra
-	char(32) character set koi8r	koi8r				
+	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 ;
 Field	Type	Collation	Null	Key	Default	Extra
-	char(32) character set koi8r	koi8r				
+	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 ;

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

sql/share/charsets/Index.xml

@@ -50,8 +50,8 @@ To make maintaining easier please:
 <charset name="dec8">
   <family>Western</family>
   <description>DEC West European</description>
-  <collation name="dec_bin"		id="69"	order="Binary"	flag="binary"/>
-  <collation name="dec8"		id="3"	flag="primary">
+  <collation name="dec8_bin"		id="69"	order="Binary"	flag="binary"/>
+  <collation name="dec8_swedish_ci"	id="3"	flag="primary">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -93,7 +93,7 @@ To make maintaining easier please:
   <alias>l1</alias>
   <alias>latin1</alias>
   <collation name="latin1_german1_ci"	id="5"	order="German Duden"/>
-  <collation name="latin1"		id="8"	order="Finnish, Swedish"	flag="primary"/>
+  <collation name="latin1_swedish_ci"	id="8"	order="Finnish, Swedish"	flag="primary"/>
   <collation name="latin1_danish_ci"	id="15"	order="Danish"/>
   <collation name="latin1_german2_ci"	id="31"	order="German Phonebook"	flag="compiled"/>
   <collation name="latin1_bin"		id="47"	order="Binary"			flag="binary"/>
@@ -123,8 +123,8 @@ To make maintaining easier please:
   <family>Western</family>
   <description>HP West European</description>
   <alias>hproman8</alias>
-  <collation name="hp8_bin"	id="72"	order="Binary"		flag="binary"/>
-  <collation name="hp8"		id="6"	flag="primary">
+  <collation name="hp8_bin"		id="72"	order="Binary"	flag="binary"/>
+  <collation name="hp8_english_ci"	id="6"	flag="primary">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -141,16 +141,16 @@ To make maintaining easier please:
   <description>KOI8-R Relcom Russian</description>
   <alias>koi8-r</alias>
   <alias>cskoi8r</alias>
-  <collation name="koi8r"	id="7"	order="Russian"	flag="primary"/>
-  <collation name="koi8r_bin"	id="74"	order="Binary"	flag="binary"/>
+  <collation name="koi8r_general_ci"	id="7"	order="Russian"	flag="primary"/>
+  <collation name="koi8r_bin"		id="74"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="swe7">
   <family>Western</family>
   <description>7bit Swedish</description>
   <alias>iso-646-se</alias>
-  <collation name="swe7"	id="10"	order="Swedish"	flag="primary"/>
-  <collation name="swe7_bin"	id="82"	order="Binary"	flag="binary"/>
+  <collation name="swe7_swedish_ci"	id="10"	order="Swedish"	flag="primary"/>
+  <collation name="swe7_bin"		id="82"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="ascii">
@@ -161,8 +161,8 @@ To make maintaining easier please:
   <alias>csascii</alias>
   <alias>iso-ir-6</alias>
   <alias>iso646-us</alias>
-  <collation name="ascii"	id="11"	order="English"	flag="primary"/>
-  <collation name="ascii_bin"	id="65"	order="Binary"	flag="binary"/>
+  <collation name="ascii_general_ci"	id="11"	order="English"	flag="primary"/>
+  <collation name="ascii_bin"		id="65"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="ujis">
@@ -187,7 +187,7 @@ To make maintaining easier please:
   <alias>windows-1251</alias>
   <alias>ms-cyr</alias>
   <alias>ms-cyrillic</alias>
-  <collation name="cp1251"	id="14"	flag="primary">
+  <collation name="cp1251_bulgarian_ci"	id="14"	flag="primary">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -196,9 +196,9 @@ To make maintaining easier please:
     <order>Mongolian</order>
     <order>Ukrainian</order>
   </collation>
-  <collation name="win1251ukr" 		id="23"	order="Depreciated"/>
+  <collation name="cp1251_ukrainian_ci"	id="23"	order="Ukrainian"/>
   <collation name="cp1251_bin"		id="50"	order="Binary"	flag="binary"/>
-  <collation name="cp1251_ci"		id="51">
+  <collation name="cp1251_general_ci"	id="51">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -207,7 +207,7 @@ To make maintaining easier please:
     <order>Mongolian</order>
     <order>Ukrainian</order>
   </collation>
-  <collation name="cp1251_cs"		id="52">
+  <collation name="cp1251_general_cs"	id="52">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -257,13 +257,13 @@ To make maintaining easier please:
   <alias>l7</alias>
   <collation name="latin7_estonian_ci"	id="20">
     <order>Estonian</order>
-    <flag>primary</flag>
   </collation>
-  <collation name="latin7_ci"		id="41">
+  <collation name="latin7_general_ci"	id="41">
     <order>Latvian</order>
     <order>Lithuanian</order>
+    <flag>primary</flag>
   </collation>
-  <collation name="latin7_cs"		id="42">
+  <collation name="latin7_general_cs"	id="42">
     <order>Latvian</order>
     <order>Lithuanian</order>
   </collation>
@@ -274,8 +274,8 @@ To make maintaining easier please:
   <family>Cyrillic</family>
   <description>KOI8-U Ukrainian</description>
   <alias>koi8-u</alias>
-  <collation name="koi8u"	id="22"	order="Ukranian"	flag="primary"/>
-  <collation name="koi8u_bin"	id="75"	order="Binary"	flag="binary"/>
+  <collation name="koi8u_general_ci"	id="22"	order="Ukranian"	flag="primary"/>
+  <collation name="koi8u_bin"		id="75"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="gb2312">
@@ -306,7 +306,7 @@ To make maintaining easier please:
   <description>Windows Central European</description>
   <alias>ms-ce</alias>
   <alias>windows-1250</alias>
-  <collation name="cp1250"	id="26"	flag="primary">
+  <collation name="cp1250_general_ci"	id="26"	flag="primary">
     <order>Hungarian</order>
     <order>Polish</order>
     <order>Romanian</order>
@@ -315,7 +315,7 @@ To make maintaining easier please:
     <order>Slovenian</order>
     <order>Sorbian</order>
   </collation>
-  <collation name="cp1250_czech"	id="34"	order="Czech"/>
+  <collation name="cp1250_czech_ci"	id="34"	order="Czech"/>
   <collation name="cp1250_bin"		id="66"	order="Binary"	flag="binary"/>
 </charset>
 
@@ -359,16 +359,16 @@ To make maintaining easier please:
   <alias>l5</alias>
   <alias>latin5</alias>
   <alias>turkish</alias>
-  <collation name="latin5"	id="30"	order="Turkish"	flag="primary"/>
-  <collation name="latin5_bin"	id="78"	order="Binary"	flag="binary"/>
+  <collation name="latin5_turkish_ci"	id="30"	order="Turkish"	flag="primary"/>
+  <collation name="latin5_bin"		id="78"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="armscii8">
   <family>South Asian</family>
   <description>ARMSCII-8 Armenian</description>
   <alias>armscii-8</alias>
-  <collation name="armscii8"	id="32"	order="Armenian"	flag="primary"/>
-  <collation name="armscii_bin"	id="64"	order="Binary"		flag="binary"/>
+  <collation name="armscii8_general_ci"	id="32"	order="Armenian"	flag="primary"/>
+  <collation name="armscii_bin"		id="64"	order="Binary"		flag="binary"/>
 </charset>
 
 <charset name="utf8">
@@ -392,8 +392,8 @@ To make maintaining easier please:
   <alias>csibm866</alias>
   <alias>ibm866</alias>
   <alias>DOSCyrillicRussian</alias>
-  <collation name="cp866"	id="36"	order="Russian"	flag="primary"/>
-  <collation name="cp866_bin"	id="68"	order="Binary"	flag="binary"/>
+  <collation name="cp866_general_ci"	id="36"	order="Russian"	flag="primary"/>
+  <collation name="cp866_bin"		id="68"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="keybcs2">
@@ -501,8 +501,8 @@ To make maintaining easier please:
   <description>Windows Arabic</description>
   <alias>ms-arab</alias>
   <alias>windows-1256</alias>
-  <collation name="cp1256_bin"	id="67"	order="Binary"	flag="binary"/>
-  <collation name="cp1256"	id="57"	order="Arabic"	flag="primary">
+  <collation name="cp1256_bin"		id="67"	order="Binary"	flag="binary"/>
+  <collation name="cp1256_general_ci"	id="57"	order="Arabic"	flag="primary">
     <order>Arabic</order>
     <order>Persian</order>
     <order>Pakistani</order>

sql/share/charsets/armscii8.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="armscii8">
+<collation name="armscii8_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

sql/share/charsets/ascii.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="ascii">
+<collation name="ascii_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

sql/share/charsets/cp1250.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="cp1250">
+<collation name="cp1250_general_ci">
 <map>
   00  01  02  03  04  05  06  07  08  09  0A  0B  0C  0D  0E  0F
   10  11  12  13  14  15  16  17  18  19  1A  1B  1C  1D  1E  1F
@@ -114,7 +114,7 @@
 </map>
 </collation>
 
-<collation name="cp1250_czech"/>
+<collation name="cp1250_czech_ci"/>
 
 <collation name="cp1250_bin"	flag="binary"/>
 

sql/share/charsets/cp1251.xml

@@ -94,7 +94,7 @@
 </unicode>
 
 
-<collation name="cp1251">
+<collation name="cp1251_bulgarian_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -119,7 +119,7 @@
 <collation name="cp1251_bin" flag="binary"/>
 
 
-<collation name="cp1251_ci">
+<collation name="cp1251_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -141,7 +141,7 @@
 </collation>
 
 
-<collation name="cp1251_cs">
+<collation name="cp1251_general_cs">
 <!--
 # Case insensitive, accent sensitive
 # Sort order is correct for Belarusian, Bulgarian, Macedonian,
@@ -170,7 +170,7 @@
 </collation>
 
 
-<collation name="win1251ukr">
+<collation name="cp1251_ukrainian_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

sql/share/charsets/cp1256.xml

@@ -95,7 +95,7 @@
 </unicode>
 
 
-<collation name="cp1256">
+<collation name="cp1256_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

sql/share/charsets/cp866.xml

@@ -94,7 +94,7 @@
 </unicode>
 
 
-<collation name="cp866">
+<collation name="cp866_general_ci">
 <!--  Case insensitive, accent sensitive -->
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F

sql/share/charsets/dec8.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="dec8">
+<collation name="dec8_swedish_ci">
 <map>
   00  01  02  03  04  05  06  07  08  09  0A  0B  0C  0D  0E  0F
   10  11  12  13  14  15  16  17  18  19  1A  1B  1C  1D  1E  1F
@@ -114,7 +114,7 @@
 </map>
 </collation>
 
-<collation name="dec_bin" flag="binary"/>
+<collation name="dec8_bin" flag="binary"/>
 
 </charset>
 

sql/share/charsets/hp8.xml

@@ -94,7 +94,7 @@
 </unicode>
 
 
-<collation name="hp8">
+<collation name="hp8_english_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

sql/share/charsets/koi8r.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="koi8r">
+<collation name="koi8r_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

sql/share/charsets/koi8u.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="koi8u">
+<collation name="koi8u_general_ci">
 <map>
   00  01  02  03  04  05  06  07  08  09  0A  0B  0C  0D  0E  0F
   10  11  12  13  14  15  16  17  18  19  1A  1B  1C  1D  1E  1F

sql/share/charsets/latin1.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="latin1">
+<collation name="latin1_swedish_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

sql/share/charsets/latin5.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="latin5">
+<collation name="latin5_turkish_ci">
 <!--
 # Note: all accented characters are compared separately (this
 # is different from the default latin1 character set, where

sql/share/charsets/latin7.xml

@@ -115,7 +115,7 @@
 </collation>
 
 
-<collation name="latin7_ci">
+<collation name="latin7_general_ci">
 <!-- Created for case-sensitive record search              -->
 <!-- by Andis Grasis & Rihards Grasis e-mail:andis@cata.lv -->
 <map>
@@ -139,7 +139,7 @@
 </collation>
 
 
-<collation name="latin7_cs">
+<collation name="latin7_general_cs">
 <!-- Created for case-insensitive record search -->
 <!-- Created by Andis & Rihards                 -->
 <map>

sql/share/charsets/swe7.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="swe7">
+<collation name="swe7_swedish_ci">
 <map>
   00  01  02  03  04  05  06  07  08  09  0A  0B  0C  0D  0E  0F
   10  11  12  13  14  15  16  17  18  19  1A  1B  1C  1D  1E  1F

strings/ctype-latin1.c

@@ -180,7 +180,7 @@ CHARSET_INFO my_charset_latin1 =
     8,0,0,				/* number    */
     MY_CS_COMPILED | MY_CS_PRIMARY,	/* state     */
     "latin1",				/* cs name    */
-    "latin1",				/* name      */
+    "latin1_swedish_ci",		/* name      */
     "",					/* comment   */
     ctype_latin1,
     to_lower_latin1,

strings/ctype-win1250ch.c

@@ -645,7 +645,7 @@ CHARSET_INFO my_charset_win1250ch =
     34,0,0,			/* number    */
     MY_CS_COMPILED|MY_CS_STRNXFRM,		/* state     */
     "cp1250",			/* cs name    */
-    "cp1250_czech",		/* name      */
+    "cp1250_czech_ci",		/* name      */
     "",				/* comment   */
     ctype_win1250ch,
     to_lower_win1250ch,