Modified:
branches/branch_3_1/connector-j/CHANGES
branches/branch_3_1/connector-j/src/com/mysql/jdbc/Charsets.properties
branches/branch_3_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
Log:
Fixed BUG#15544, no "dos" character set in MySQL > 4.1.0.
Modified: branches/branch_3_1/connector-j/CHANGES
===================================================================
--- branches/branch_3_1/connector-j/CHANGES 2005-12-19 16:14:05 UTC (rev 4706)
+++ branches/branch_3_1/connector-j/CHANGES 2005-12-19 16:25:52 UTC (rev 4707)
@@ -7,6 +7,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_3_1/connector-j/src/com/mysql/jdbc/Charsets.properties
===================================================================
--- branches/branch_3_1/connector-j/src/com/mysql/jdbc/Charsets.properties 2005-12-19 16:14:05 UTC (rev 4706)
+++ branches/branch_3_1/connector-j/src/com/mysql/jdbc/Charsets.properties 2005-12-19 16:25:52 UTC (rev 4707)
@@ -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_3_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
===================================================================
--- branches/branch_3_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java 2005-12-19 16:14:05 UTC (rev 4706)
+++ branches/branch_3_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java 2005-12-19 16:25:52 UTC (rev 4707)
@@ -1455,9 +1455,28 @@
advisorConn.close();
}
}
-
}
+ /**
+ * 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();
+ }
+ }
+ }
+
public void testCSC5765() throws Exception {
if (isRunningOnJdk131()) {
return; // test not valid on JDK-1.3.1
| Thread |
|---|
| • Connector/J commit: r4707 - in branches/branch_3_1/connector-j: . src/com/mysql/jdbc src/testsuite/regression | mmatthews | 19 Dec |
