diff options
| author | unknown <gluh@mysql.com> | 2005-07-21 17:55:16 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2005-07-21 17:55:16 +0500 |
| commit | 4ca63ea4d5bd2a7b830cca700f1db4d9914ceac3 (patch) | |
| tree | 389d2304be29f9eb17e2d4e1cbd454b4e3c8b9c1 /mysql-test | |
| parent | 4ad998027a5408eb8256b091ed4546749dad5eb6 (diff) | |
| parent | b5487d1a7e3047ac516677663e1404c06e285d41 (diff) | |
| download | mariadb-git-4ca63ea4d5bd2a7b830cca700f1db4d9914ceac3.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into mysql.com:/home/gluh/MySQL/Merge/5.0
sql/share/charsets/Index.xml:
Auto merged
strings/ctype-latin1.c:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_latin1.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result index 21c40e24fe2..95fca1575ef 100644 --- a/mysql-test/r/ctype_latin1.result +++ b/mysql-test/r/ctype_latin1.result @@ -168,7 +168,7 @@ hex(a) hex(@u:=convert(a using utf8)) hex(@l:=convert(@u using latin1)) a=@l 7E 7E 7E 1 7F 7F 7F 1 80 E282AC 80 1 -81 3F 3F 0 +81 C281 81 1 82 E2809A 82 1 83 C692 83 1 84 E2809E 84 1 @@ -180,10 +180,10 @@ hex(a) hex(@u:=convert(a using utf8)) hex(@l:=convert(@u using latin1)) a=@l 8A C5A0 8A 1 8B E280B9 8B 1 8C C592 8C 1 -8D 3F 3F 0 +8D C28D 8D 1 8E C5BD 8E 1 -8F 3F 3F 0 -90 3F 3F 0 +8F C28F 8F 1 +90 C290 90 1 91 E28098 91 1 92 E28099 92 1 93 E2809C 93 1 @@ -196,7 +196,7 @@ hex(a) hex(@u:=convert(a using utf8)) hex(@l:=convert(@u using latin1)) a=@l 9A C5A1 9A 1 9B E280BA 9B 1 9C C593 9C 1 -9D 3F 3F 0 +9D C29D 9D 1 9E C5BE 9E 1 9F C5B8 9F 1 A0 C2A0 A0 1 |