Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.12076
This commit is contained in:
commit
2c2ee32b93
@ -115,7 +115,10 @@ To make maintaining easier please:
|
|||||||
<alias>l1</alias>
|
<alias>l1</alias>
|
||||||
<alias>latin1</alias>
|
<alias>latin1</alias>
|
||||||
<collation name="latin1_german1_ci" id="5" order="German Duden"/>
|
<collation name="latin1_german1_ci" id="5" order="German Duden"/>
|
||||||
<collation name="latin1_swedish_ci" id="8" order="Finnish, Swedish" flag="primary"/>
|
<collation name="latin1_swedish_ci" id="8" order="Finnish, Swedish">
|
||||||
|
<flag>primary</flag>
|
||||||
|
<flag>compiled</flag>
|
||||||
|
</collation>
|
||||||
<collation name="latin1_danish_ci" id="15" order="Danish"/>
|
<collation name="latin1_danish_ci" id="15" order="Danish"/>
|
||||||
<collation name="latin1_german2_ci" id="31" order="German Phonebook" flag="compiled"/>
|
<collation name="latin1_german2_ci" id="31" order="German Phonebook" flag="compiled"/>
|
||||||
<collation name="latin1_spanish_ci" id="94" order="Spanish"/>
|
<collation name="latin1_spanish_ci" id="94" order="Spanish"/>
|
||||||
|
@ -33,14 +33,14 @@
|
|||||||
01 01 01 01 01 01 01 01 01 01 01 10 10 10 10 10
|
01 01 01 01 01 01 01 01 01 01 01 10 10 10 10 10
|
||||||
10 82 82 82 82 82 82 02 02 02 02 02 02 02 02 02
|
10 82 82 82 82 82 82 02 02 02 02 02 02 02 02 02
|
||||||
02 02 02 02 02 02 02 02 02 02 02 10 10 10 10 20
|
02 02 02 02 02 02 02 02 02 02 02 10 10 10 10 20
|
||||||
20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
|
10 00 10 02 10 10 10 10 10 10 01 10 01 00 01 00
|
||||||
20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
|
00 10 10 10 10 10 10 10 10 10 02 10 02 00 02 01
|
||||||
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
48 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10
|
||||||
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10
|
||||||
01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
|
01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
|
||||||
01 01 01 01 01 01 01 00 01 01 01 01 01 01 01 02
|
01 01 01 01 01 01 01 10 01 01 01 01 01 01 01 02
|
||||||
02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02
|
02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02
|
||||||
02 02 02 02 02 02 02 00 02 02 02 02 02 02 02 02
|
02 02 02 02 02 02 02 10 02 02 02 02 02 02 02 02
|
||||||
</map>
|
</map>
|
||||||
</ctype>
|
</ctype>
|
||||||
|
|
||||||
@ -99,8 +99,8 @@
|
|||||||
0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 005A 005B 005C 005D 005E 005F
|
0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 005A 005B 005C 005D 005E 005F
|
||||||
0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 006A 006B 006C 006D 006E 006F
|
0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 006A 006B 006C 006D 006E 006F
|
||||||
0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 007F
|
0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 007F
|
||||||
0080 0081 0082 0083 0084 0085 0086 0087 0088 0089 008A 008B 008C 008D 008E 008F
|
20AC 0081 201A 0192 201E 2026 2020 2021 02C6 2030 0160 2039 0152 008D 017D 008F
|
||||||
0090 0091 0092 0093 0094 0095 0096 0097 0098 0099 009A 009B 009C 009D 009E 009F
|
0090 2018 2019 201C 201D 2022 2013 2014 02DC 2122 0161 203A 0153 009D 017E 0178
|
||||||
00A0 00A1 00A2 00A3 00A4 00A5 00A6 00A7 00A8 00A9 00AA 00AB 00AC 00AD 00AE 00AF
|
00A0 00A1 00A2 00A3 00A4 00A5 00A6 00A7 00A8 00A9 00AA 00AB 00AC 00AD 00AE 00AF
|
||||||
00B0 00B1 00B2 00B3 00B4 00B5 00B6 00B7 00B8 00B9 00BA 00BB 00BC 00BD 00BE 00BF
|
00B0 00B1 00B2 00B3 00B4 00B5 00B6 00B7 00B8 00B9 00BA 00BB 00BC 00BD 00BE 00BF
|
||||||
00C0 00C1 00C2 00C3 00C4 00C5 00C6 00C7 00C8 00C9 00CA 00CB 00CC 00CD 00CE 00CF
|
00C0 00C1 00C2 00C3 00C4 00C5 00C6 00C7 00C8 00C9 00CA 00CB 00CC 00CD 00CE 00CF
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user