Merge

VC++Files/client/mysqlclient.dsp

@@ -147,6 +147,10 @@ SOURCE="..\strings\ctype-bin.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-cp932.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -155,6 +159,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-eucjpms.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-extra.c"
 # End Source File
 # Begin Source File

VC++Files/client/mysqlclient_ia64.dsp

@@ -147,6 +147,10 @@ SOURCE="..\strings\ctype-bin.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-cp932.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -155,6 +159,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-eucjpms.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-extra.c"
 # End Source File
 # Begin Source File

VC++Files/libmysql/libmysql.dsp

@@ -139,6 +139,10 @@ SOURCE="..\strings\ctype-bin.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-cp932.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -147,6 +151,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-eucjpms.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-extra.c"
 # End Source File
 # Begin Source File

VC++Files/libmysql/libmysql_ia64.dsp

@@ -138,6 +138,10 @@ SOURCE="..\strings\ctype-bin.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-cp932.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -146,6 +150,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-eucjpms.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-extra.c"
 # End Source File
 # Begin Source File

VC++Files/strings/strings.dsp

@@ -113,10 +113,18 @@ SOURCE=".\ctype-bin.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-cp932.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-czech.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-eucjpms.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-euc_kr.c"
 # End Source File
 # Begin Source File

VC++Files/strings/strings_ia64.dsp

@@ -112,6 +112,10 @@ SOURCE=".\ctype-bin.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-cp932.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -120,6 +124,10 @@ SOURCE=".\ctype-euc_kr.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-eucjpms.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-extra.c"
 # End Source File
 # Begin Source File

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