List:Commits« Previous MessageNext Message »
From:bar Date:May 5 2008 11:22am
Subject:bk commit into 6.0 tree (bar:1.2642) BUG#25420
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 repository of bar.  When bar does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-05 16:22:31+05:00, bar@stripped +16 -0
  Bug#25420 Tilde = 'Y' in Chinese
  Problems: wrong sort orders for the following characters:
  - TILDE and GRAVE ACCENT in big5_chinese_ci
  - LATIN SMALL LETTER J in cp866_general_ci
  - TILDE in gb2312_chinese_ci
  - TILDE in gbk_chinese_ci

  mysql-test/include/ctype_ascii_order.inc@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +14 -0
    New BitKeeper file ``mysql-test/include/ctype_ascii_order.inc''

  mysql-test/include/ctype_ascii_order.inc@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +0 -0

  mysql-test/r/ctype_big5.result@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +82 -0
    Adding tests

  mysql-test/r/ctype_cp866.result@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +84 -0
    New BitKeeper file ``mysql-test/r/ctype_cp866.result''

  mysql-test/r/ctype_cp866.result@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +0 -0

  mysql-test/r/ctype_gb2312.result@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +82 -0
    Adding tests

  mysql-test/r/ctype_gbk.result@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +82 -0
    Adding tests

  mysql-test/r/ctype_tis620.result@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +82 -0
    Adding tests

  mysql-test/t/ctype_big5.test@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -0
    Adding tests

  mysql-test/t/ctype_cp866.test@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +4 -0
    New BitKeeper file ``mysql-test/t/ctype_cp866.test''

  mysql-test/t/ctype_cp866.test@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +0 -0

  mysql-test/t/ctype_gb2312.test@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -0
    Adding tests

  mysql-test/t/ctype_gbk.test@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -0
    Adding tests

  mysql-test/t/ctype_tis620.test@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -0
    Adding tests

  sql/share/charsets/cp866.xml@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -1
    Fixing problem that "J" was not equal to "j"

  strings/ctype-big5.c@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +2 -2
    Fixing wrong order for TILDE and GRAVE ACCENT

  strings/ctype-extra.c@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -1
    Recreating ctype-extra.c from the fixed version of cp866.xml

  strings/ctype-gb2312.c@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -1
    Fixing wrong order for TIDLE

  strings/ctype-gbk.c@stripped, 2008-05-05 16:22:28+05:00, bar@stripped +1 -1
    Fixing wrong order for TILDE

diff -Nrup a/mysql-test/include/ctype_ascii_order.inc b/mysql-test/include/ctype_ascii_order.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/include/ctype_ascii_order.inc	2008-05-05 16:22:28 +05:00
@@ -0,0 +1,14 @@
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+create table t1 select repeat('a',10) as c1;
+delete from t1;
+insert into t1 values (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27),(0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);
+insert into t1 values (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37),(0x38),(0x39),(0x3A),(0x3B),(0x3C),(0x3D),(0x3E),(0x3F);
+insert into t1 values (0x40),(0x41),(0x42),(0x43),(0x44),(0x45),(0x46),(0x47),(0x48),(0x49),(0x4A),(0x4B),(0x4C),(0x4D),(0x4E),(0x4F);
+insert into t1 values (0x50),(0x51),(0x52),(0x53),(0x54),(0x55),(0x56),(0x57),(0x58),(0x59),(0x5A),(0x5B),(0x5C),(0x5D),(0x5E),(0x5F);
+insert into t1 values (0x60),(0x61),(0x62),(0x63),(0x64),(0x65),(0x66),(0x67),(0x68),(0x69),(0x6A),(0x6B),(0x6C),(0x6D),(0x6E),(0x6F);
+insert into t1 values (0x70),(0x71),(0x72),(0x73),(0x74),(0x75),(0x76),(0x77),(0x78),(0x79),(0x7A),(0x7B),(0x7C),(0x7D),(0x7E),(0x7F);
+select group_concat(c1 order by binary c1 SEPARATOR ''), group_concat(hex(c1)) from t1 group by c1;
+drop table t1;
diff -Nrup a/mysql-test/r/ctype_big5.result b/mysql-test/r/ctype_big5.result
--- a/mysql-test/r/ctype_big5.result	2008-04-14 15:09:56 +05:00
+++ b/mysql-test/r/ctype_big5.result	2008-05-05 16:22:28 +05:00
@@ -160,6 +160,88 @@ a	hex(b)	c
 3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 DROP TABLE t1;
+drop table if exists t1;
+create table t1 select repeat('a',10) as c1;
+delete from t1;
+insert into t1 values (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27),(0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);
+insert into t1 values (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37),(0x38),(0x39),(0x3A),(0x3B),(0x3C),(0x3D),(0x3E),(0x3F);
+insert into t1 values (0x40),(0x41),(0x42),(0x43),(0x44),(0x45),(0x46),(0x47),(0x48),(0x49),(0x4A),(0x4B),(0x4C),(0x4D),(0x4E),(0x4F);
+insert into t1 values (0x50),(0x51),(0x52),(0x53),(0x54),(0x55),(0x56),(0x57),(0x58),(0x59),(0x5A),(0x5B),(0x5C),(0x5D),(0x5E),(0x5F);
+insert into t1 values (0x60),(0x61),(0x62),(0x63),(0x64),(0x65),(0x66),(0x67),(0x68),(0x69),(0x6A),(0x6B),(0x6C),(0x6D),(0x6E),(0x6F);
+insert into t1 values (0x70),(0x71),(0x72),(0x73),(0x74),(0x75),(0x76),(0x77),(0x78),(0x79),(0x7A),(0x7B),(0x7C),(0x7D),(0x7E),(0x7F);
+select group_concat(c1 order by binary c1 SEPARATOR ''), group_concat(hex(c1)) from t1 group by c1;
+group_concat(c1 order by binary c1 SEPARATOR '')	group_concat(hex(c1))
+ 	20
+!	21
+"	22
+#	23
+$	24
+%	25
+&	26
+'	27
+(	28
+)	29
+*	2A
++	2B
+,	2C
+-	2D
+.	2E
+/	2F
+0	30
+1	31
+2	32
+3	33
+4	34
+5	35
+6	36
+7	37
+8	38
+9	39
+:	3A
+;	3B
+<	3C
+=	3D
+>	3E
+?	3F
+@	40
+Aa	41,61
+Bb	62,42
+Cc	63,43
+Dd	64,44
+Ee	65,45
+Ff	66,46
+Gg	67,47
+Hh	68,48
+Ii	49,69
+Jj	4A,6A
+Kk	4B,6B
+Ll	6C,4C
+Mm	6D,4D
+Nn	4E,6E
+Oo	6F,4F
+Pp	70,50
+Qq	71,51
+Rr	72,52
+Ss	73,53
+Tt	74,54
+Uu	55,75
+Vv	56,76
+Ww	57,77
+Xx	58,78
+Yy	59,79
+Zz	5A,7A
+]	5D
+[	5B
+\	5C
+^	5E
+_	5F
+`	60
+{	7B
+|	7C
+}	7D
+~	7E
+	7F
+drop table t1;
 SET collation_connection='big5_bin';
 create table t1 select repeat('a',4000) a;
 delete from t1;
diff -Nrup a/mysql-test/r/ctype_cp866.result b/mysql-test/r/ctype_cp866.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/ctype_cp866.result	2008-05-05 16:22:28 +05:00
@@ -0,0 +1,84 @@
+set names cp866;
+drop table if exists t1;
+create table t1 select repeat('a',10) as c1;
+delete from t1;
+insert into t1 values (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27),(0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);
+insert into t1 values (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37),(0x38),(0x39),(0x3A),(0x3B),(0x3C),(0x3D),(0x3E),(0x3F);
+insert into t1 values (0x40),(0x41),(0x42),(0x43),(0x44),(0x45),(0x46),(0x47),(0x48),(0x49),(0x4A),(0x4B),(0x4C),(0x4D),(0x4E),(0x4F);
+insert into t1 values (0x50),(0x51),(0x52),(0x53),(0x54),(0x55),(0x56),(0x57),(0x58),(0x59),(0x5A),(0x5B),(0x5C),(0x5D),(0x5E),(0x5F);
+insert into t1 values (0x60),(0x61),(0x62),(0x63),(0x64),(0x65),(0x66),(0x67),(0x68),(0x69),(0x6A),(0x6B),(0x6C),(0x6D),(0x6E),(0x6F);
+insert into t1 values (0x70),(0x71),(0x72),(0x73),(0x74),(0x75),(0x76),(0x77),(0x78),(0x79),(0x7A),(0x7B),(0x7C),(0x7D),(0x7E),(0x7F);
+select group_concat(c1 order by binary c1 SEPARATOR ''), group_concat(hex(c1)) from t1 group by c1;
+group_concat(c1 order by binary c1 SEPARATOR '')	group_concat(hex(c1))
+ 	20
+!	21
+"	22
+#	23
+$	24
+%	25
+&	26
+'	27
+(	28
+)	29
+*	2A
++	2B
+,	2C
+-	2D
+.	2E
+/	2F
+0	30
+1	31
+2	32
+3	33
+4	34
+5	35
+6	36
+7	37
+8	38
+9	39
+:	3A
+;	3B
+<	3C
+=	3D
+>	3E
+?	3F
+@	40
+Aa	41,61
+Bb	62,42
+Cc	63,43
+Dd	64,44
+Ee	65,45
+Ff	66,46
+Gg	67,47
+Hh	68,48
+Ii	49,69
+Jj	4A,6A
+Kk	4B,6B
+Ll	6C,4C
+Mm	6D,4D
+Nn	4E,6E
+Oo	6F,4F
+Pp	70,50
+Qq	71,51
+Rr	72,52
+Ss	73,53
+Tt	74,54
+Uu	55,75
+Vv	56,76
+Ww	57,77
+Xx	58,78
+Yy	59,79
+Zz	5A,7A
+[	5B
+\	5C
+]	5D
+^	5E
+_	5F
+`	60
+{	7B
+|	7C
+}	7D
+~	7E
+	7F
+drop table t1;
+End of 6.0 tests.
diff -Nrup a/mysql-test/r/ctype_gb2312.result b/mysql-test/r/ctype_gb2312.result
--- a/mysql-test/r/ctype_gb2312.result	2008-03-27 22:58:36 +04:00
+++ b/mysql-test/r/ctype_gb2312.result	2008-05-05 16:22:28 +05:00
@@ -160,6 +160,88 @@ a	hex(b)	c
 3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 DROP TABLE t1;
+drop table if exists t1;
+create table t1 select repeat('a',10) as c1;
+delete from t1;
+insert into t1 values (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27),(0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);
+insert into t1 values (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37),(0x38),(0x39),(0x3A),(0x3B),(0x3C),(0x3D),(0x3E),(0x3F);
+insert into t1 values (0x40),(0x41),(0x42),(0x43),(0x44),(0x45),(0x46),(0x47),(0x48),(0x49),(0x4A),(0x4B),(0x4C),(0x4D),(0x4E),(0x4F);
+insert into t1 values (0x50),(0x51),(0x52),(0x53),(0x54),(0x55),(0x56),(0x57),(0x58),(0x59),(0x5A),(0x5B),(0x5C),(0x5D),(0x5E),(0x5F);
+insert into t1 values (0x60),(0x61),(0x62),(0x63),(0x64),(0x65),(0x66),(0x67),(0x68),(0x69),(0x6A),(0x6B),(0x6C),(0x6D),(0x6E),(0x6F);
+insert into t1 values (0x70),(0x71),(0x72),(0x73),(0x74),(0x75),(0x76),(0x77),(0x78),(0x79),(0x7A),(0x7B),(0x7C),(0x7D),(0x7E),(0x7F);
+select group_concat(c1 order by binary c1 SEPARATOR ''), group_concat(hex(c1)) from t1 group by c1;
+group_concat(c1 order by binary c1 SEPARATOR '')	group_concat(hex(c1))
+ 	20
+!	21
+"	22
+#	23
+$	24
+%	25
+&	26
+'	27
+(	28
+)	29
+*	2A
++	2B
+,	2C
+-	2D
+.	2E
+/	2F
+0	30
+1	31
+2	32
+3	33
+4	34
+5	35
+6	36
+7	37
+8	38
+9	39
+:	3A
+;	3B
+<	3C
+=	3D
+>	3E
+?	3F
+@	40
+Aa	41,61
+Bb	62,42
+Cc	63,43
+Dd	64,44
+Ee	65,45
+Ff	66,46
+Gg	67,47
+Hh	68,48
+Ii	49,69
+Jj	4A,6A
+Kk	4B,6B
+Ll	6C,4C
+Mm	6D,4D
+Nn	4E,6E
+Oo	6F,4F
+Pp	70,50
+Qq	71,51
+Rr	72,52
+Ss	73,53
+Tt	74,54
+Uu	55,75
+Vv	56,76
+Ww	57,77
+Xx	58,78
+Yy	59,79
+Zz	5A,7A
+]	5D
+[	5B
+\	5C
+^	5E
+_	5F
+`	60
+{	7B
+|	7C
+}	7D
+~	7E
+	7F
+drop table t1;
 SET collation_connection='gb2312_bin';
 create table t1 select repeat('a',4000) a;
 delete from t1;
diff -Nrup a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result
--- a/mysql-test/r/ctype_gbk.result	2008-03-27 22:58:36 +04:00
+++ b/mysql-test/r/ctype_gbk.result	2008-05-05 16:22:28 +05:00
@@ -160,6 +160,88 @@ a	hex(b)	c
 3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 DROP TABLE t1;
+drop table if exists t1;
+create table t1 select repeat('a',10) as c1;
+delete from t1;
+insert into t1 values (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27),(0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);
+insert into t1 values (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37),(0x38),(0x39),(0x3A),(0x3B),(0x3C),(0x3D),(0x3E),(0x3F);
+insert into t1 values (0x40),(0x41),(0x42),(0x43),(0x44),(0x45),(0x46),(0x47),(0x48),(0x49),(0x4A),(0x4B),(0x4C),(0x4D),(0x4E),(0x4F);
+insert into t1 values (0x50),(0x51),(0x52),(0x53),(0x54),(0x55),(0x56),(0x57),(0x58),(0x59),(0x5A),(0x5B),(0x5C),(0x5D),(0x5E),(0x5F);
+insert into t1 values (0x60),(0x61),(0x62),(0x63),(0x64),(0x65),(0x66),(0x67),(0x68),(0x69),(0x6A),(0x6B),(0x6C),(0x6D),(0x6E),(0x6F);
+insert into t1 values (0x70),(0x71),(0x72),(0x73),(0x74),(0x75),(0x76),(0x77),(0x78),(0x79),(0x7A),(0x7B),(0x7C),(0x7D),(0x7E),(0x7F);
+select group_concat(c1 order by binary c1 SEPARATOR ''), group_concat(hex(c1)) from t1 group by c1;
+group_concat(c1 order by binary c1 SEPARATOR '')	group_concat(hex(c1))
+ 	20
+!	21
+"	22
+#	23
+$	24
+%	25
+&	26
+'	27
+(	28
+)	29
+*	2A
++	2B
+,	2C
+-	2D
+.	2E
+/	2F
+0	30
+1	31
+2	32
+3	33
+4	34
+5	35
+6	36
+7	37
+8	38
+9	39
+:	3A
+;	3B
+<	3C
+=	3D
+>	3E
+?	3F
+@	40
+Aa	41,61
+Bb	62,42
+Cc	63,43
+Dd	64,44
+Ee	65,45
+Ff	66,46
+Gg	67,47
+Hh	68,48
+Ii	49,69
+Jj	4A,6A
+Kk	4B,6B
+Ll	6C,4C
+Mm	6D,4D
+Nn	4E,6E
+Oo	6F,4F
+Pp	70,50
+Qq	71,51
+Rr	72,52
+Ss	73,53
+Tt	74,54
+Uu	55,75
+Vv	56,76
+Ww	57,77
+Xx	58,78
+Yy	59,79
+Zz	5A,7A
+]	5D
+[	5B
+\	5C
+^	5E
+_	5F
+`	60
+{	7B
+|	7C
+}	7D
+~	7E
+	7F
+drop table t1;
 SET collation_connection='gbk_bin';
 create table t1 select repeat('a',4000) a;
 delete from t1;
diff -Nrup a/mysql-test/r/ctype_tis620.result b/mysql-test/r/ctype_tis620.result
--- a/mysql-test/r/ctype_tis620.result	2007-04-03 16:16:07 +05:00
+++ b/mysql-test/r/ctype_tis620.result	2008-05-05 16:22:28 +05:00
@@ -3046,6 +3046,88 @@ hex(weight_string('abc' as char(5) LEVEL
 select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE));
 hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE))
 DFDF9C9D9E
+drop table if exists t1;
+create table t1 select repeat('a',10) as c1;
+delete from t1;
+insert into t1 values (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27),(0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);
+insert into t1 values (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37),(0x38),(0x39),(0x3A),(0x3B),(0x3C),(0x3D),(0x3E),(0x3F);
+insert into t1 values (0x40),(0x41),(0x42),(0x43),(0x44),(0x45),(0x46),(0x47),(0x48),(0x49),(0x4A),(0x4B),(0x4C),(0x4D),(0x4E),(0x4F);
+insert into t1 values (0x50),(0x51),(0x52),(0x53),(0x54),(0x55),(0x56),(0x57),(0x58),(0x59),(0x5A),(0x5B),(0x5C),(0x5D),(0x5E),(0x5F);
+insert into t1 values (0x60),(0x61),(0x62),(0x63),(0x64),(0x65),(0x66),(0x67),(0x68),(0x69),(0x6A),(0x6B),(0x6C),(0x6D),(0x6E),(0x6F);
+insert into t1 values (0x70),(0x71),(0x72),(0x73),(0x74),(0x75),(0x76),(0x77),(0x78),(0x79),(0x7A),(0x7B),(0x7C),(0x7D),(0x7E),(0x7F);
+select group_concat(c1 order by binary c1 SEPARATOR ''), group_concat(hex(c1)) from t1 group by c1;
+group_concat(c1 order by binary c1 SEPARATOR '')	group_concat(hex(c1))
+ 	20
+!	21
+"	22
+#	23
+$	24
+%	25
+&	26
+'	27
+(	28
+)	29
+*	2A
++	2B
+,	2C
+-	2D
+.	2E
+/	2F
+0	30
+1	31
+2	32
+3	33
+4	34
+5	35
+6	36
+7	37
+8	38
+9	39
+:	3A
+;	3B
+<	3C
+=	3D
+>	3E
+?	3F
+@	40
+[	5B
+\	5C
+]	5D
+^	5E
+_	5F
+`	60
+Aa	61,41
+Bb	42,62
+Cc	63,43
+Dd	64,44
+Ee	45,65
+Ff	46,66
+Gg	47,67
+Hh	48,68
+Ii	49,69
+Jj	4A,6A
+Kk	6B,4B
+Ll	6C,4C
+Mm	4D,6D
+Nn	6E,4E
+Oo	6F,4F
+Pp	50,70
+Qq	71,51
+Rr	72,52
+Ss	53,73
+Tt	54,74
+Uu	75,55
+Vv	76,56
+Ww	57,77
+Xx	58,78
+Yy	79,59
+Zz	7A,5A
+{	7B
+|	7C
+}	7D
+~	7E
+	7F
+drop table t1;
 select hex(weight_string(cast(0xE0A1 as char)));
 hex(weight_string(cast(0xE0A1 as char)))
 A1E0
diff -Nrup a/mysql-test/t/ctype_big5.test b/mysql-test/t/ctype_big5.test
--- a/mysql-test/t/ctype_big5.test	2008-02-21 09:32:16 +04:00
+++ b/mysql-test/t/ctype_big5.test	2008-05-05 16:22:28 +05:00
@@ -17,6 +17,7 @@ SET collation_connection='big5_chinese_c
 -- source include/ctype_innodb_like.inc
 -- source include/ctype_like_escape.inc
 -- source include/ctype_like_range_f1f2.inc
+-- source include/ctype_ascii_order.inc
 SET collation_connection='big5_bin';
 -- source include/ctype_filesort.inc
 -- source include/ctype_innodb_like.inc
diff -Nrup a/mysql-test/t/ctype_cp866.test b/mysql-test/t/ctype_cp866.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/ctype_cp866.test	2008-05-05 16:22:28 +05:00
@@ -0,0 +1,4 @@
+set names cp866;
+--source include/ctype_ascii_order.inc
+
+--echo End of 6.0 tests.
diff -Nrup a/mysql-test/t/ctype_gb2312.test b/mysql-test/t/ctype_gb2312.test
--- a/mysql-test/t/ctype_gb2312.test	2008-02-21 09:32:22 +04:00
+++ b/mysql-test/t/ctype_gb2312.test	2008-05-05 16:22:28 +05:00
@@ -17,6 +17,7 @@ SET collation_connection='gb2312_chinese
 -- source include/ctype_innodb_like.inc
 -- source include/ctype_like_escape.inc
 -- source include/ctype_like_range_f1f2.inc
+-- source include/ctype_ascii_order.inc
 SET collation_connection='gb2312_bin';
 -- source include/ctype_filesort.inc
 -- source include/ctype_innodb_like.inc
diff -Nrup a/mysql-test/t/ctype_gbk.test b/mysql-test/t/ctype_gbk.test
--- a/mysql-test/t/ctype_gbk.test	2008-02-21 09:32:22 +04:00
+++ b/mysql-test/t/ctype_gbk.test	2008-05-05 16:22:28 +05:00
@@ -17,6 +17,7 @@ SET collation_connection='gbk_chinese_ci
 -- source include/ctype_innodb_like.inc
 -- source include/ctype_like_escape.inc
 -- source include/ctype_like_range_f1f2.inc
+-- source include/ctype_ascii_order.inc
 SET collation_connection='gbk_bin';
 -- source include/ctype_filesort.inc
 -- source include/ctype_innodb_like.inc
diff -Nrup a/mysql-test/t/ctype_tis620.test b/mysql-test/t/ctype_tis620.test
--- a/mysql-test/t/ctype_tis620.test	2007-04-03 16:16:08 +05:00
+++ b/mysql-test/t/ctype_tis620.test	2008-05-05 16:22:28 +05:00
@@ -167,6 +167,7 @@ set names tis620;
 set collation_connection=tis620_thai_ci;
 --source include/weight_string.inc
 --source include/weight_string_l1.inc
+--source include/ctype_ascii_order.inc
 select hex(weight_string(cast(0xE0A1 as char)));
 select hex(weight_string(cast(0xE0A1 as char) as char(1)));
 
diff -Nrup a/sql/share/charsets/cp866.xml b/sql/share/charsets/cp866.xml
--- a/sql/share/charsets/cp866.xml	2006-12-23 23:04:28 +04:00
+++ b/sql/share/charsets/cp866.xml	2008-05-05 16:22:28 +05:00
@@ -120,7 +120,7 @@
  30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F
  40 41 43 45 47 49 4B 4D 4F 51 53 55 57 59 5B 5D
  5F 61 63 65 67 69 6B 6D 6F 71 73 BD BE BF C0 C1
- C2 41 43 45 47 49 4B 4D 4F 51 54 55 57 59 5B 5D
+ C2 41 43 45 47 49 4B 4D 4F 51 53 55 57 59 5B 5D
  5F 61 63 65 67 69 6B 6D 6F 71 73 C3 C4 C5 C6 C7
  75 77 79 7B 7D 7F 85 87 89 8D 8F 91 93 95 97 99
  9B 9D 9F A1 A5 A7 A9 AB AD AF B1 B3 B5 B7 B9 BB
diff -Nrup a/strings/ctype-big5.c b/strings/ctype-big5.c
--- a/strings/ctype-big5.c	2007-10-09 22:17:18 +05:00
+++ b/strings/ctype-big5.c	2008-05-05 16:22:28 +05:00
@@ -154,10 +154,10 @@ static uchar NEAR sort_order_big5[]=
   'H',	 'I',	'J',   'K',   'L',   'M',   'N',   'O',
   'P',	 'Q',	'R',   'S',   'T',   'U',   'V',   'W',
   'X',	 'Y',	'Z',   '\\',  ']',   '[',   '^',   '_',
-  'E',	 'A',	'B',   'C',   'D',   'E',   'F',   'G',
+ 0x60,	 'A',	'B',   'C',   'D',   'E',   'F',   'G',
   'H',	 'I',	'J',   'K',   'L',   'M',   'N',   'O',
   'P',	 'Q',	'R',   'S',   'T',   'U',   'V',   'W',
-  'X',	 'Y',	'Z',   '{',   '|',   '}',   'Y',   '\177',
+  'X',	 'Y',	'Z',   '{',   '|',   '}',  0x7E,   '\177',
   (uchar) '\200',(uchar) '\201',(uchar) '\202',(uchar) '\203',(uchar) '\204',(uchar) '\205',(uchar) '\206',(uchar) '\207',
   (uchar) '\210',(uchar) '\211',(uchar) '\212',(uchar) '\213',(uchar) '\214',(uchar) '\215',(uchar) '\216',(uchar) '\217',
   (uchar) '\220',(uchar) '\221',(uchar) '\222',(uchar) '\223',(uchar) '\224',(uchar) '\225',(uchar) '\226',(uchar) '\227',
diff -Nrup a/strings/ctype-extra.c b/strings/ctype-extra.c
--- a/strings/ctype-extra.c	2007-08-31 03:49:11 +05:00
+++ b/strings/ctype-extra.c	2008-05-05 16:22:28 +05:00
@@ -2505,7 +2505,7 @@ uchar sort_order_cp866_general_ci[] = {
 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
 0x40,0x41,0x43,0x45,0x47,0x49,0x4B,0x4D,0x4F,0x51,0x53,0x55,0x57,0x59,0x5B,0x5D,
 0x5F,0x61,0x63,0x65,0x67,0x69,0x6B,0x6D,0x6F,0x71,0x73,0xBD,0xBE,0xBF,0xC0,0xC1,
-0xC2,0x41,0x43,0x45,0x47,0x49,0x4B,0x4D,0x4F,0x51,0x54,0x55,0x57,0x59,0x5B,0x5D,
+0xC2,0x41,0x43,0x45,0x47,0x49,0x4B,0x4D,0x4F,0x51,0x53,0x55,0x57,0x59,0x5B,0x5D,
 0x5F,0x61,0x63,0x65,0x67,0x69,0x6B,0x6D,0x6F,0x71,0x73,0xC3,0xC4,0xC5,0xC6,0xC7,
 0x75,0x77,0x79,0x7B,0x7D,0x7F,0x85,0x87,0x89,0x8D,0x8F,0x91,0x93,0x95,0x97,0x99,
 0x9B,0x9D,0x9F,0xA1,0xA5,0xA7,0xA9,0xAB,0xAD,0xAF,0xB1,0xB3,0xB5,0xB7,0xB9,0xBB,
diff -Nrup a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
--- a/strings/ctype-gb2312.c	2008-02-21 09:32:30 +04:00
+++ b/strings/ctype-gb2312.c	2008-05-05 16:22:28 +05:00
@@ -139,7 +139,7 @@ static uchar NEAR sort_order_gb2312[]=
   '`',	 'A',	'B',   'C',   'D',   'E',   'F',   'G',
   'H',	 'I',	'J',   'K',   'L',   'M',   'N',   'O',
   'P',	 'Q',	'R',   'S',   'T',   'U',   'V',   'W',
-  'X',	 'Y',	'Z',   '{',   '|',   '}',   'Y',   '\177',
+  'X',	 'Y',	'Z',   '{',   '|',   '}',  0x7E,   '\177',
   (uchar) '\200',(uchar) '\201',(uchar) '\202',(uchar) '\203',(uchar) '\204',(uchar) '\205',(uchar) '\206',(uchar) '\207',
   (uchar) '\210',(uchar) '\211',(uchar) '\212',(uchar) '\213',(uchar) '\214',(uchar) '\215',(uchar) '\216',(uchar) '\217',
   (uchar) '\220',(uchar) '\221',(uchar) '\222',(uchar) '\223',(uchar) '\224',(uchar) '\225',(uchar) '\226',(uchar) '\227',
diff -Nrup a/strings/ctype-gbk.c b/strings/ctype-gbk.c
--- a/strings/ctype-gbk.c	2007-06-30 23:13:27 +05:00
+++ b/strings/ctype-gbk.c	2008-05-05 16:22:28 +05:00
@@ -154,7 +154,7 @@ static uchar NEAR sort_order_gbk[]=
   '`',	 'A',	'B',   'C',   'D',   'E',   'F',   'G',
   'H',	 'I',	'J',   'K',   'L',   'M',   'N',   'O',
   'P',	 'Q',	'R',   'S',   'T',   'U',   'V',   'W',
-  'X',	 'Y',	'Z',   '{',   '|',   '}',   'Y',   '\177',
+  'X',	 'Y',	'Z',   '{',   '|',   '}',  0x7E,   '\177',
   (uchar) '\200',(uchar) '\201',(uchar) '\202',(uchar) '\203',(uchar) '\204',(uchar) '\205',(uchar) '\206',(uchar) '\207',
   (uchar) '\210',(uchar) '\211',(uchar) '\212',(uchar) '\213',(uchar) '\214',(uchar) '\215',(uchar) '\216',(uchar) '\217',
   (uchar) '\220',(uchar) '\221',(uchar) '\222',(uchar) '\223',(uchar) '\224',(uchar) '\225',(uchar) '\226',(uchar) '\227',
Thread
bk commit into 6.0 tree (bar:1.2642) BUG#25420bar5 May