diff options
| author | unknown <lenz@mysql.com> | 2005-06-01 15:11:14 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-01 15:11:14 +0200 |
| commit | 29fb604ddf9477142a1a1ca044d37572921f5799 (patch) | |
| tree | e1aefa8a0b44cfe02ff518c8f5a95210aef9dd02 /include | |
| parent | bac98672ee5e325c91a2b2f5f7a3126d4362ba10 (diff) | |
| parent | 853a55ad215db4f44bee4281de57054bf2f7da17 (diff) | |
| download | mariadb-git-29fb604ddf9477142a1a1ca044d37572921f5799.tar.gz | |
Merge of 4.1 -> 5.0
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/strings/strings.dsp:
Auto merged
VC++Files/strings/strings_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge, fixed NDB_VERSION_BUILD
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 a4f81a0ec6a..bc14d3d3e53 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -399,6 +399,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_eucjpms 1 #define HAVE_CHARSET_euckr 1 |