Connector/J commit: r6322 - branches/branch_5_0/connector-j/src/com/mysql/jdbc trunk/connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/Connection.java
   trunk/connector-j/src/com/mysql/jdbc/Connection.java
Log:
Fix JDK6 preferring MS932 over SJIS for character set mapping.

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/Connection.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/Connection.java	2007-02-23 21:52:30
UTC (rev 6321)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/Connection.java	2007-02-23 22:09:06
UTC (rev 6322)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2002-2004 MySQL AB
+ Copyright (C) 2002-2007 MySQL AB
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of version 2 of the GNU General Public License as 
@@ -3511,7 +3511,8 @@
 			try {
 				charsetName = this.indexToCharsetMapping[charsetIndex];
 
-				if ("sjis".equalsIgnoreCase(charsetName)) {
+				if ("sjis".equalsIgnoreCase(charsetName) || 
+						"MS932".equalsIgnoreCase(charsetName) /* for JDK6 */) {
 					// Use our encoding so that code pages like Cp932 work
 					if (CharsetMapping.isAliasForSjis(getEncoding())) {
 						charsetName = getEncoding();

Modified: trunk/connector-j/src/com/mysql/jdbc/Connection.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/Connection.java	2007-02-23 21:52:30 UTC (rev
6321)
+++ trunk/connector-j/src/com/mysql/jdbc/Connection.java	2007-02-23 22:09:06 UTC (rev
6322)
@@ -2663,7 +2663,8 @@
 			try {
 				charsetName = this.indexToCharsetMapping[charsetIndex];
 
-				if ("sjis".equalsIgnoreCase(charsetName)) {
+				if ("sjis".equalsIgnoreCase(charsetName) || 
+						"MS932".equalsIgnoreCase(charsetName) /* for JDK6 */) {
 					// Use our encoding so that code pages like Cp932 work
 					if (CharsetMapping.isAliasForSjis(getEncoding())) {
 						charsetName = getEncoding();