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 /sql/share/charsets/Index.xml | |
| 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 'sql/share/charsets/Index.xml')
| -rw-r--r-- | sql/share/charsets/Index.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index a6bb4bad99b..32fd1618a8b 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -106,7 +106,7 @@ To make maintaining easier please: <charset name="latin1"> <family>Western</family> - <description>ISO 8859-1 West European</description> + <description>cp1252 West European</description> <alias>csisolatin1</alias> <alias>iso-8859-1</alias> <alias>iso-ir-100</alias> |