diff options
| author | unknown <mskold@mysql.com> | 2005-04-08 19:42:57 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-04-08 19:42:57 +0200 |
| commit | 127b0271b0ef22b1a627edd7ada6b262c1bc21b3 (patch) | |
| tree | 81a561826a281de1ba356afb0b6227c00924bb7e /include | |
| parent | dc1343239a1293891a1ff2a07cbde13c6b00f882 (diff) | |
| parent | 533b3f0af114e5d84f5bce204b97f16fbbb7cf1f (diff) | |
| download | mariadb-git-127b0271b0ef22b1a627edd7ada6b262c1bc21b3.tar.gz | |
Merge
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index df0530fbef3..bc392ce73d8 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -378,6 +378,7 @@ inline double ulonglong2double(ulonglong value) /* #undef HAVE_CHARSET_armscii8 */ /* #undef HAVE_CHARSET_ascii */ #define HAVE_CHARSET_big5 1 +#define HAVE_CHARSET_cp932 #define HAVE_CHARSET_cp1250 1 /* #undef HAVE_CHARSET_cp1251 */ /* #undef HAVE_CHARSET_cp1256 */ @@ -386,6 +387,7 @@ inline double ulonglong2double(ulonglong value) /* #undef HAVE_CHARSET_cp852 */ /* #undef HAVE_CHARSET_cp866 */ /* #undef HAVE_CHARSET_dec8 */ +#define HAVE_CHARSET_eucjpms 1 #define HAVE_CHARSET_euckr 1 #define HAVE_CHARSET_gb2312 1 #define HAVE_CHARSET_gbk 1 |