Connector/J commit: r4162 - in branches/branch_3_1/connector-j: . src/com/mysql/jdbc src/testsuite/regression

[mmatthews]

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#12752 - Cp1251 incorrectly mapped to win1251 for 
      servers newer than 4.0.x.

Modified: branches/branch_3_1/connector-j/CHANGES
===================================================================
--- branches/branch_3_1/connector-j/CHANGES	2005-08-30 19:14:01 UTC (rev 4161)
+++ branches/branch_3_1/connector-j/CHANGES	2005-08-30 19:49:40 UTC (rev 4162)
@@ -126,6 +126,9 @@
     - Fixed BUG#12417 - Connection.prepareCall() is database name 
       case-sensitive (on Windows systems).
       
+    - Fixed BUG#12752 - Cp1251 incorrectly mapped to win1251 for 
+      servers newer than 4.0.x.
+      
 06-23-05 - Version 3.1.10-stable
 
 	- Fixed connecting without a database specified raised an exception

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-08-30
19:14:01 UTC (rev 4161)
+++ branches/branch_3_1/connector-j/src/com/mysql/jdbc/Charsets.properties	2005-08-30
19:49:40 UTC (rev 4162)
@@ -40,8 +40,8 @@
  		TIS620 = 			tis620,\
 		Cp1250 = 			cp1250,\
 		Cp1250 = 			win1250,\
+		Cp1251 = 			*>4.1.0 cp1251,\
 		Cp1251 = 			win1251,\
-		Cp1251 = 			cp1251,\
  		Cp1251 = 			cp1251cias,\
 		Cp1251 = 			cp1251csas,\
 		Cp1256 = 			cp1256,\

Modified:
branches/branch_3_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
===================================================================
---
branches/branch_3_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2005-08-30
19:14:01 UTC (rev 4161)
+++
branches/branch_3_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2005-08-30
19:49:40 UTC (rev 4162)
@@ -1197,6 +1197,18 @@
 	}
 	
 	/**
+	 * Tests fix for BUG#12752 - Cp1251 incorrectly mapped to
+	 * win1251 for servers newer than 4.0.x.
+	 * 
+	 * @throws Exception if the test fails.
+	 */
+	public void testBug12752() throws Exception {
+		Properties props = new Properties();
+		props.setProperty("characterEncoding", "Cp1251");
+		getConnectionWithProps(props).close();
+	}
+	
+	/**
 	 * Tests fix for BUG#12753, sessionVariables=....=....,
 	 * doesn't work as it's tokenized incorrectly.
 	 *