diff options
author | unknown <monty@hundin.mysql.fi> | 2001-09-09 03:53:35 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-09-09 03:53:35 +0300 |
commit | 354882c8ce232770b2f3604cbcd5142aad6b002c (patch) | |
tree | 7893a6d7541d528adc361f7fab05306a890040b0 /sql | |
parent | 66cc095efb843a03e42696a6ff555bf40185747b (diff) | |
parent | 4b39ab54a9d9d5250eb388e019f6eaaaf70fca38 (diff) | |
download | mariadb-git-354882c8ce232770b2f3604cbcd5142aad6b002c.tar.gz |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'sql')
-rw-r--r-- | sql/share/charsets/Index | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/share/charsets/Index b/sql/share/charsets/Index index b91e27e7c02..5cf30682cc0 100644 --- a/sql/share/charsets/Index +++ b/sql/share/charsets/Index @@ -1,6 +1,7 @@ # sql/share/charsets/Index # -# This file lists all of the available character sets. +# This file lists all of the available character sets. Please keep this +# file sorted by character set number. big5 1 @@ -34,3 +35,4 @@ croat 27 gbk 28 cp1257 29 latin5 30 +latin1_de 31 |