diff options
| author | unknown <peter@mysql.com> | 2002-10-23 23:28:36 +0400 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-10-23 23:28:36 +0400 |
| commit | 8962d3f66dfcb32184247bca592ca4deb7444e3b (patch) | |
| tree | 907ffabc91f9688c8c16980884dc18d4f16325da /sql/share/charsets/Index | |
| parent | 5a84f21cac57141425e327336a72f0bafc8298b8 (diff) | |
| parent | 020e3bd7130d1076ed4c1cb2d1df32a656549f73 (diff) | |
| download | mariadb-git-8962d3f66dfcb32184247bca592ca4deb7444e3b.tar.gz | |
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
libmysql/Makefile.shared:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/share/charsets/Index')
| -rw-r--r-- | sql/share/charsets/Index | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/charsets/Index b/sql/share/charsets/Index index 009eeaeac38..8351d079ce1 100644 --- a/sql/share/charsets/Index +++ b/sql/share/charsets/Index @@ -66,3 +66,6 @@ macromanbin 53 macromancias 54 macromanciai 55 macromancsas 56 +cp1256 57 + +binary 63 |