diff options
| author | unknown <jimw@mysql.com> | 2005-12-12 10:11:56 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-12-12 10:11:56 -0800 |
| commit | d6e5fdf08ab5d78b31587f9847d29c8d46f171e6 (patch) | |
| tree | bbcd25d2b7951525f91290ea07d709f48525c788 /sql/share/charsets | |
| parent | 95cabee1dc3a6d44a7e7a4c74c0bd49e00047f5b (diff) | |
| parent | ab597139a7e96d8e3194739299b9dbde5a6cf961 (diff) | |
| download | mariadb-git-d6e5fdf08ab5d78b31587f9847d29c8d46f171e6.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/bdb.result:
Resolve conflicts
mysql-test/t/bdb.test:
Resolve conflicts
sql/sql_delete.cc:
Resolve conflicts
sql/sql_insert.cc:
Resolve conflicts
sql/sql_update.cc:
Resolve conflicts
Diffstat (limited to 'sql/share/charsets')
| -rw-r--r-- | sql/share/charsets/latin5.xml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sql/share/charsets/latin5.xml b/sql/share/charsets/latin5.xml index 67e5873c503..5004f045889 100644 --- a/sql/share/charsets/latin5.xml +++ b/sql/share/charsets/latin5.xml @@ -112,11 +112,6 @@ <collation name="latin5_turkish_ci"> -<!-- -# Note: all accented characters are compared separately (this -# is different from the default latin1 character set, where -# e.g. a = ä = á, etc.). ---> <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 @@ -130,10 +125,10 @@ 9C 9D 9E 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE BF C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB - CC CD CE CF D0 D1 D2 44 D3 D4 D5 D6 D7 D8 D9 DA - 49 DB DC DD DE DF 53 E0 E1 E2 E3 E4 5B 4C 58 E5 - CC CD CE CF D0 D1 D2 44 D3 D4 D5 D6 D7 D8 D9 DA - 49 DB DC DD DE DF 53 FA E1 E2 E3 E4 5B 4B 58 FF + 41 41 41 41 41 41 41 44 46 46 46 46 4C 4C 4C 4C + 49 51 52 52 52 52 53 E0 52 5A 5A 5A 5B 4C 58 57 + 41 41 41 41 41 41 41 44 46 46 46 46 4C 4C 4C 4C + 49 51 52 52 52 52 53 FA 52 5A 5A 5A 5B 4B 58 5F </map> </collation> |