List:Commits« Previous MessageNext Message »
From:Alexander Barkov Date:May 5 2010 1:36pm
Subject:bzr commit into mysql-next-mr branch (bar:3122) WL#4013
View as plain text  
#At file:///home/bar/mysql-bzr/mysql-next-mr-bar/ based on revid:bar@stripped

 3122 Alexander Barkov	2010-05-05
      Post-fix for WL#4013 Unicode german2 collation
      Changes:
      - Adding tailoring for "LIGAUTRE AE" and "LIGATURE OR"
      - Adding tests

    modified:
      mysql-test/include/ctype_german.inc
      mysql-test/r/ctype_latin1_de.result
      mysql-test/r/ctype_uca.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf16_uca.result
      mysql-test/r/ctype_utf32_uca.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/r/ctype_utf8mb4_heap.result
      mysql-test/r/ctype_utf8mb4_innodb.result
      mysql-test/r/ctype_utf8mb4_myisam.result
      mysql-test/r/ctype_utf8mb4_ndb.result
      mysql-test/t/ctype_uca.test
      strings/ctype-uca.c
=== modified file 'mysql-test/include/ctype_german.inc'
--- a/mysql-test/include/ctype_german.inc	2010-03-22 09:13:41 +0000
+++ b/mysql-test/include/ctype_german.inc	2010-05-05 13:35:35 +0000
@@ -38,6 +38,11 @@ insert into t1 values ('o'),('oe'),(_lat
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
 
+# LIGATURE AE
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+# LIGATURE OE
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
+
 #
 # Check order
 #

=== modified file 'mysql-test/r/ctype_latin1_de.result'
--- a/mysql-test/r/ctype_latin1_de.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_latin1_de.result	2010-05-05 13:35:35 +0000
@@ -341,6 +341,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -362,6 +364,10 @@ ud	7564
 ue	7565
 �uf	7566
+�C6
+�6
+�	8C
+�	9C
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a
@@ -379,6 +385,9 @@ u
 ud
 ue,�+���
+�
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	41
@@ -400,6 +409,10 @@ ud	7564	5544
 ue	7565	5545
 �545
 uf	7566	5546
+�C6	5C
+�6	5C
+�	8C	8C
+�	9C	9C
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165

=== modified file 'mysql-test/r/ctype_uca.result'
--- a/mysql-test/r/ctype_uca.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_uca.result	2010-05-05 13:35:35 +0000
@@ -2121,6 +2121,112 @@ Z,z,Ź,ź,Ż,ż,Ž,ž
 ǁ
 ǂ
 ǃ
+select group_concat(c1 order by c1) from t1 group by c1 collate utf8_german2_ci;
+group_concat(c1 order by c1)
+÷
+×
+A,a,À,Á,Â,Ã,Å,à,á,â,ã,å,Ā,ā,Ă,ă,Ą,ą,Ǎ,ǎ,Ǟ,ǟ,Ǡ,ǡ,Ǻ,ǻ
+AA,Aa,aA,aa
+Ä,Æ,ä,æ
+Ǣ,ǣ,Ǽ,ǽ
+B,b
+ƀ
+Ɓ
+Ƃ,ƃ
+C,c,Ç,ç,Ć,ć,Ĉ,ĉ,Ċ,ċ,Č,č
+CH,Ch,cH,ch
+Ƈ,ƈ
+D,d,Ď,ď
+DZ,Dz,dZ,dz,DŽ,Dž,dž,DZ,Dz,dz
+Đ,đ
+Ɖ
+Ɗ
+Ƌ,ƌ
+Ð,ð
+E,e,È,É,Ê,Ë,è,é,ê,ë,Ē,ē,Ĕ,ĕ,,ğ,Ġ,ġ,Ģ,ģ,Ǧ,ǧ,Ǵ,ǵ
+Ǥ,ǥ
+Ɠ
+Ɣ
+Ƣ,ƣ
+H,h,Ĥ,ĥ
+ƕ,Ƕ
+Ħ,ħ
+I,i,Ì,Í,Î,Ï,ì,í,î,ï,Ĩ,ĩ,Ī,j,Ĵ,ĵ,ǰ
+K,k,Ķ,ķ,Ǩ,ǩ
+Ƙ,ƙ
+L,l,Ĺ,ĺ,Ļ,ļ,Ľ,ľ
+Ŀ,ŀ
+LJ,Lj,lJ,lj,LJ,Lj,lj
+LL,Ll,lL,ll
+Ł,ł
+ƚ
+ƛ
+M,m
+N,n,Ñ,ñ,Ń,ń,Ņ,ņ,Ň,ň,Ǹ,ǹ
+NJ,Nj,nJ,nj,NJ,Nj,nj
+Ɲ
+ƞ
+Ŋ,ŋ
+O,o,Ò,Ó,Ô,Õ,ò,ó,ô,õ,Ō,ō,œ
+Ø,ø,Ǿ,ǿ
+Ɔ
+Ɵ
+P,p
+Ƥ,ƥ
+Q,q
+ĸ
+R,r,Ŕ,ŕ,ſ
+SS,Ss,sS,ss,ß
+Ʃ
+ƪ
+T,t,Ţ,ţ,Ť,ť
+ƾ
+Ŧ,ŧ
+ů,Ű,ű,Ų,ų,Ư,ư,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ
+Ü,ü
+Ɯ
+Ʊ
+V,v
+Ʋ
+W,w,Ŵ,ŵ
+X,x
+Y,y,Ý,ý,ÿ,Ŷ,ŷ,Ÿ
+Ƴ,ƴ
+Z,z,Ź,ź,Ż,ż,Ž,ž
+ƍ
+Ƶ,ƶ
+Ʒ,Ǯ,ǯ
+Ƹ,ƹ
+ƺ
+Þ,þ
+ƿ,Ƿ
+ƻ
+Ƨ,ƨ
+Ƽ,ƽ
+Ƅ,ƅ
+ʼn
+ǀ
+ǁ
+ǂ
+ǃ
 drop table t1;
 SET NAMES utf8;
 CREATE TABLE t1 (c varchar(255) NOT NULL COLLATE utf8_general_ci, INDEX (c));
@@ -2681,6 +2787,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -2688,11 +2796,15 @@ a	61
 ad	6164
 ae	6165
 af	6166
+Æ	C386
+æ	C3A6
 e	65
 o	6F
 ö	C3B6
 od	6F64
 oe	6F65
+Œ	C592
+œ	C593
 of	6F66
 s	73
 ss	7373
@@ -2708,10 +2820,11 @@ a,ä
 ad
 ae
 af
+Æ,æ
 e
 o,ö
 od
-oe
+oe,Œ,œ
 of
 s
 ss,ß
@@ -2726,11 +2839,15 @@ a	61	0E33
 ad	6164	0E330E6D
 ae	6165	0E330E8B
 af	6166	0E330EB9
+Æ	C386	0E38
+æ	C3A6	0E38
 e	65	0E8B
 o	6F	0F82
 ö	C3B6	0F82
 od	6F64	0F820E6D
 oe	6F65	0F820E8B
+Œ	C592	0F820E8B
+œ	C593	0F820E8B
 of	6F66	0F820EB9
 s	73	0FEA
 ss	7373	0FEA0FEA

=== modified file 'mysql-test/r/ctype_ucs.result'
--- a/mysql-test/r/ctype_ucs.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_ucs.result	2010-05-05 13:35:35 +0000
@@ -741,6 +741,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	0061
@@ -762,6 +764,10 @@ u	0075
 ud	00750064
 ue	00750065
 uf	00750066
+�00C6
+�0E6
+�	0152
+�	0153
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,�@ -779,6 +785,8 @@ u,� ue
 uf
+���,�
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	0061	0041
@@ -800,6 +808,10 @@ u	0075	0055
 ud	00750064	00550044
 ue	00750065	00550045
 uf	00750066	00550046
+�00C6	00C6
+�0E6	00C6
+�	0152	0152
+�	0153	0152
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	00610065

=== modified file 'mysql-test/r/ctype_utf16_uca.result'
--- a/mysql-test/r/ctype_utf16_uca.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_utf16_uca.result	2010-05-05 13:35:35 +0000
@@ -2726,18 +2726,24 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	0061
 ad	00610064
 ae	00610065
+Æ	00C6
 ä	00E4
+æ	00E6
 af	00610066
 e	0065
 o	006F
 od	006F0064
 oe	006F0065
 ö	00F6
+Œ	0152
+œ	0153
 of	006F0066
 s	0073
 ss	00730073
@@ -2751,12 +2757,12 @@ select group_concat(s1 order by binary s
 group_concat(s1 order by binary s1)
 a
 ad
-ae,ä
+ae,Æ,ä,æ
 af
 e
 o
 od
-oe,ö
+oe,ö,Œ,œ
 of
 s
 ss,ß
@@ -2769,13 +2775,17 @@ s1	hex(s1)	hex(weight_string(s1))
 a	0061	0E33
 ad	00610064	0E330E6D
 ae	00610065	0E330E8B
+Æ	00C6	0E330E8B
 ä	00E4	0E330E8B
+æ	00E6	0E330E8B
 af	00610066	0E330EB9
 e	0065	0E8B
 o	006F	0F82
 od	006F0064	0F820E6D
 oe	006F0065	0F820E8B
 ö	00F6	0F820E8B
+Œ	0152	0F820E8B
+œ	0153	0F820E8B
 of	006F0066	0F820EB9
 s	0073	0FEA
 ss	00730073	0FEA0FEA
@@ -2788,7 +2798,9 @@ uf	00750066	101F0EB9
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	00610065
+Æ	00C6
 ä	00E4
+æ	00E6
 drop table t1;
 "END ctype_german.inc"
 #

=== modified file 'mysql-test/r/ctype_utf32_uca.result'
--- a/mysql-test/r/ctype_utf32_uca.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_utf32_uca.result	2010-05-05 13:35:35 +0000
@@ -2726,18 +2726,24 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	00000061
 ad	0000006100000064
 ae	0000006100000065
+Æ	000000C6
 ä	000000E4
+æ	000000E6
 af	0000006100000066
 e	00000065
 o	0000006F
 od	0000006F00000064
 oe	0000006F00000065
 ö	000000F6
+Œ	00000152
+œ	00000153
 of	0000006F00000066
 s	00000073
 ss	0000007300000073
@@ -2751,12 +2757,12 @@ select group_concat(s1 order by binary s
 group_concat(s1 order by binary s1)
 a
 ad
-ae,ä
+ae,Æ,ä,æ
 af
 e
 o
 od
-oe,ö
+oe,ö,Œ,œ
 of
 s
 ss,ß
@@ -2769,13 +2775,17 @@ s1	hex(s1)	hex(weight_string(s1))
 a	00000061	0E33
 ad	0000006100000064	0E330E6D
 ae	0000006100000065	0E330E8B
+Æ	000000C6	0E330E8B
 ä	000000E4	0E330E8B
+æ	000000E6	0E330E8B
 af	0000006100000066	0E330EB9
 e	00000065	0E8B
 o	0000006F	0F82
 od	0000006F00000064	0F820E6D
 oe	0000006F00000065	0F820E8B
 ö	000000F6	0F820E8B
+Œ	00000152	0F820E8B
+œ	00000153	0F820E8B
 of	0000006F00000066	0F820EB9
 s	00000073	0FEA
 ss	0000007300000073	0FEA0FEA
@@ -2788,7 +2798,9 @@ uf	0000007500000066	101F0EB9
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	0000006100000065
+Æ	000000C6
 ä	000000E4
+æ	000000E6
 drop table t1;
 "END ctype_german.inc"
 #

=== modified file 'mysql-test/r/ctype_utf8.result'
--- a/mysql-test/r/ctype_utf8.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_utf8.result	2010-05-05 13:35:35 +0000
@@ -954,6 +954,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -975,6 +977,10 @@ u	75
 ud	7564
 ue	7565
 uf	7566
+Æ	C386
+æ	C3A6
+Œ	C592
+œ	C593
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -992,6 +998,8 @@ u,ü
 ud
 ue
 uf
+Æ,æ
+Œ,œ
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -1013,6 +1021,10 @@ u	75	0055
 ud	7564	00550044
 ue	7565	00550045
 uf	7566	00550046
+Æ	C386	00C6
+æ	C3A6	00C6
+Œ	C592	0152
+œ	C593	0152
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165

=== modified file 'mysql-test/r/ctype_utf8mb4.result'
--- a/mysql-test/r/ctype_utf8mb4.result	2010-03-24 10:21:36 +0000
+++ b/mysql-test/r/ctype_utf8mb4.result	2010-05-05 13:35:35 +0000
@@ -957,6 +957,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -978,6 +980,10 @@ u	75
 ud	7564
 ue	7565
 uf	7566
+Æ	C386
+æ	C3A6
+Œ	C592
+œ	C593
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -995,6 +1001,8 @@ u,ü
 ud
 ue
 uf
+Æ,æ
+Œ,œ
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -1016,6 +1024,10 @@ u	75	0055
 ud	7564	00550044
 ue	7565	00550045
 uf	7566	00550046
+Æ	C386	00C6
+æ	C3A6	00C6
+Œ	C592	0152
+œ	C593	0152
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165

=== modified file 'mysql-test/r/ctype_utf8mb4_heap.result'
--- a/mysql-test/r/ctype_utf8mb4_heap.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_utf8mb4_heap.result	2010-05-05 13:35:35 +0000
@@ -896,6 +896,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -917,6 +919,10 @@ u	75
 ud	7564
 ue	7565
 uf	7566
+Æ	C386
+æ	C3A6
+Œ	C592
+œ	C593
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -934,6 +940,8 @@ u,ü
 ud
 ue
 uf
+Æ,æ
+Œ,œ
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -955,6 +963,10 @@ u	75	0055
 ud	7564	00550044
 ue	7565	00550045
 uf	7566	00550046
+Æ	C386	00C6
+æ	C3A6	00C6
+Œ	C592	0152
+œ	C593	0152
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165

=== modified file 'mysql-test/r/ctype_utf8mb4_innodb.result'
--- a/mysql-test/r/ctype_utf8mb4_innodb.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_utf8mb4_innodb.result	2010-05-05 13:35:35 +0000
@@ -957,6 +957,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -978,6 +980,10 @@ u	75
 ud	7564
 ue	7565
 uf	7566
+Æ	C386
+æ	C3A6
+Œ	C592
+1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -995,6 +1001,8 @@ u,ü
 ud
 ue
 uf
+Æ,æ
+Œ,œ
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -1016,6 +1024,10 @@ u	75	0055
 ud	7564	00550044
 ue	7565	00550045
 uf	7566	00550046
+Æ	C386	00C6
+æ	C3A6	00C6
+Œ	C592	0152
+œ	C593	0152
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165

=== modified file 'mysql-test/r/ctype_utf8mb4_myisam.result'
--- a/mysql-test/r/ctype_utf8mb4_myisam.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_utf8mb4_myisam.result	2010-05-05 13:35:35 +0000
@@ -957,6 +957,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -978,6 +980,10 @@ u	75
 ud	7564
 ue	7565
 uf	7566
+Æ	C386
+æ	C3A6
+Œ	C592
+œ	C593
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -995,6 +1001,8 @@ u,ü
 ud
 ue
 uf
+Æ,æ
+Œ,œ
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -1016,6 +1024,10 @@ u	75	0055
 ud	7564	00550044
 ue	7565	00550045
 uf	7566	00550046
+Æ	C386	00C6
+æ	C3A6	00C6
+Œ	C592	0152
+œ	C593	0152
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165

=== modified file 'mysql-test/r/ctype_utf8mb4_ndb.result'
--- a/mysql-test/r/ctype_utf8mb4_ndb.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_utf8mb4_ndb.result	2010-05-05 13:35:35 +0000
@@ -520,6 +520,8 @@ insert into t1 values ('a'),('ae'),(_lat
 insert into t1 values ('o'),('oe'),(_latin1 0xF6);
 insert into t1 values ('s'),('ss'),(_latin1 0xDF);
 insert into t1 values ('u'),('ue'),(_latin1 0xFC);
+INSERT INTO t1 VALUES (_latin1 0xE6), (_latin1 0xC6);
+INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
 select s1, hex(s1) from t1 order by s1, binary s1;
 s1	hex(s1)
 a	61
@@ -541,6 +543,10 @@ u	75
 ud	7564
 ue	7565
 uf	7566
+Æ	C386
+æ	C3A6
+Œ	C592
+œ	C593
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -558,6 +564,8 @@ u,ü
 ud
 ue
 uf
+Æ,æ
+Œ,œ
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -579,6 +587,10 @@ u	75	0055
 ud	7564	00550044
 ue	7565	00550045
 uf	7566	00550046
+Æ	C386	00C6
+æ	C3A6	00C6
+Œ	C592	0152
+œ	C593	0152
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165

=== modified file 'mysql-test/t/ctype_uca.test'
--- a/mysql-test/t/ctype_uca.test	2010-03-22 09:13:41 +0000
+++ b/mysql-test/t/ctype_uca.test	2010-05-05 13:35:35 +0000
@@ -213,6 +213,7 @@ select group_concat(c1 order by c1) from
 select group_concat(c1 order by c1) from t1 group by c1 collate utf8_roman_ci;
 select group_concat(c1 order by c1) from t1 group by c1 collate utf8_esperanto_ci;
 select group_concat(c1 order by c1) from t1 group by c1 collate utf8_hungarian_ci;
+select group_concat(c1 order by c1) from t1 group by c1 collate utf8_german2_ci;
 
 drop table t1;
 

=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2010-03-22 09:13:41 +0000
+++ b/strings/ctype-uca.c	2010-05-05 13:35:35 +0000
@@ -6527,8 +6527,8 @@ page0FCdata,page0FDdata,page0FEdata,page
   German Phonebook
 */
 static const char german2[]=
-    "&AE << \\u00E4 <<< \\u00C4 "
-    "&OE << \\u00F6 <<< \\u00D6 "
+    "&AE << \\u00E6 <<< \\u00C6 << \\u00E4 <<< \\u00C4 "
+    "&OE << \\u0153 <<< \\u0152 << \\u00F6 <<< \\u00D6 "
     "&UE << \\u00FC <<< \\u00DC ";
 
 

Attachment: [text/bzr-bundle] bzr/bar@mysql.com-20100505133535-mng37jqqu9i193nk.bundle
Thread
bzr commit into mysql-next-mr branch (bar:3122) WL#4013Alexander Barkov5 May