From: mmatthews
Date: December 19 2005 4:28pm
Subject: Connector/J commit: r4708 - in branches/branch_5_0/connector-j: . src/com/mysql/jdbc src/testsuite/regression
List-Archive: http://lists.mysql.com/commits/263
X-Bug: 15544
Message-Id: <200512191628.jBJGSgsL015435@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/branch_5_0/connector-j/CHANGES
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/Charsets.properties
   branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
Log:
Fixed BUG#15544, no "dos" character set in MySQL > 4.1.0 (merged from 3.1 branch).
    

Modified: branches/branch_5_0/connector-j/CHANGES
===================================================================
--- branches/branch_5_0/connector-j/CHANGES	2005-12-19 16:25:52 UTC (rev 4707)
+++ branches/branch_5_0/connector-j/CHANGES	2005-12-19 16:28:40 UTC (rev 4708)
@@ -93,6 +93,8 @@
     
     - Fixed BUG#14609 - Exception thrown for new decimal type when 
       using updatable result sets.
+            
+    - Fixed BUG#15544, no "dos" character set in MySQL > 4.1.0
     
 11-30-05 - Version 3.1.12
 

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/Charsets.properties
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/Charsets.properties	2005-12-19 16:25:52 UTC (rev 4707)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/Charsets.properties	2005-12-19 16:28:40 UTC (rev 4708)
@@ -31,6 +31,7 @@
  		ISO8859_13 =		latvian,\
 		ISO8859_13 =		latvian1,\
 		ISO8859_13 =		estonia,\
+		Cp437 =             *>4.1.0 cp850,\
  		Cp437 =				dos,\
  		Cp850 =				Cp850,\
 		Cp852 = 			Cp852,\

Modified: branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
===================================================================
--- branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2005-12-19 16:25:52 UTC (rev 4707)
+++ branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2005-12-19 16:28:40 UTC (rev 4708)
@@ -1561,4 +1561,24 @@
 			}
 		}
 	}
+
+	/**
+	 * Tests fix for BUG#15544, no "dos" character set
+	 * in MySQL > 4.1.0
+	 * 
+	 * @throws Exception if the test fails
+	 */
+	public void testBug15544() throws Exception {
+		Properties props = new Properties();
+		props.setProperty("characterEncoding", "Cp437");
+		Connection dosConn = null;
+		
+		try {
+			dosConn = getConnectionWithProps(props);
+		} finally {
+			if (dosConn != null) {
+				dosConn.close();
+			}
+		}
+	}
 }