diff options
| author | unknown <lenz@mysql.com> | 2005-05-26 11:43:47 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-05-26 11:43:47 +0200 |
| commit | f30b7ed4162c6548304c0e0ecdda510df165951e (patch) | |
| tree | 1053945981e5b0eacb2a44cba72cba8006d4b115 /include | |
| parent | aa3a934b9d2e7585d9e40a4f56a060bad718baf5 (diff) | |
| parent | 1794eb3e2b60494d7f39bde29114b58d2d768165 (diff) | |
| download | mariadb-git-f30b7ed4162c6548304c0e0ecdda510df165951e.tar.gz | |
- merged the 4.1.12a Changes back into the main tree
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge (corrected version number)
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index b3865c1fda7..86704c4740b 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -393,6 +393,7 @@ inline double ulonglong2double(ulonglong value) /* #undef HAVE_CHARSET_cp850 */ /* #undef HAVE_CHARSET_cp852 */ /* #undef HAVE_CHARSET_cp866 */ +#define HAVE_CHARSET_cp932 1 /* #undef HAVE_CHARSET_dec8 */ #define HAVE_CHARSET_euckr 1 #define HAVE_CHARSET_gb2312 1 |