Connector/J commit: r6132 - branches/branch_3_1/connector-j branches/branch_3_1/connector-j/src/com/mysql/jdbc branches/branch_3_1/connector-j/src/tes...

[mmatthews]

Modified:
   branches/branch_3_1/connector-j/CHANGES
   branches/branch_3_1/connector-j/src/com/mysql/jdbc/CharsetMapping.java
   branches/branch_3_1/connector-j/src/testsuite/regression/StringRegressionTest.java
   branches/branch_5_0/connector-j/CHANGES
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/CharsetMapping.java
   branches/branch_5_0/connector-j/src/testsuite/regression/StringRegressionTest.java
   trunk/connector-j/CHANGES
   trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java
   trunk/connector-j/src/testsuite/regression/StringRegressionTest.java
Log:
Fixed BUG#24840 - character encoding of "US-ASCII" doesn't map correctly 
	  for 4.1 or newer

Modified: branches/branch_3_1/connector-j/CHANGES
===================================================================
--- branches/branch_3_1/connector-j/CHANGES	2006-12-07 01:01:51 UTC (rev 6131)
+++ branches/branch_3_1/connector-j/CHANGES	2006-12-07 22:06:30 UTC (rev 6132)
@@ -10,7 +10,10 @@
 	
 	- Handle YYYY-MM-DD hh:mm:ss format of timestamp in 
 	  ResultSet.getTimeFromString().
-	  
+
+	- Fixed BUG#24840 - character encoding of "US-ASCII" doesn't map correctly 
+	  for 4.1 or newer
+	  	  
 10-19-06 - Version 3.1.14
 
     - Fixed BUG#20479 - Updatable result set throws ClassCastException

Modified: branches/branch_3_1/connector-j/src/com/mysql/jdbc/CharsetMapping.java
===================================================================
--- branches/branch_3_1/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-12-07
01:01:51 UTC (rev 6131)
+++ branches/branch_3_1/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-12-07
22:06:30 UTC (rev 6132)
@@ -75,7 +75,7 @@
 			//                           denotes preferred value)      
 			//
 			"US-ASCII =			usa7,"
-	 		+ "US-ASCII =			ascii,"
+	 		+ "US-ASCII =			>4.1.0 ascii,"
 	 		+ "Big5 = 				big5,"
 	 		+ "GBK = 				gbk,"
 	 		+ "SJIS = 				sjis,"

Modified:
branches/branch_3_1/connector-j/src/testsuite/regression/StringRegressionTest.java
===================================================================
---
branches/branch_3_1/connector-j/src/testsuite/regression/StringRegressionTest.java	2006-12-07
01:01:51 UTC (rev 6131)
+++
branches/branch_3_1/connector-j/src/testsuite/regression/StringRegressionTest.java	2006-12-07
22:06:30 UTC (rev 6132)
@@ -831,4 +831,17 @@
 			assertEquals(this.rs.getString(1), codePage1252);
 		}
 	}
+	
+	/**
+	 * Tests fix for BUG#24840 - character encoding of "US-ASCII"
+	 * doesn't map correctly for 4.1 or newer
+	 * 
+	 * @throws Exception if the test fails.
+	 */
+	public void testBug24840() throws Exception {
+		Properties props = new Properties();
+		props.setProperty("characterEncoding", "US-ASCII");
+		
+		getConnectionWithProps(props).close();
+	}
 }

Modified: branches/branch_5_0/connector-j/CHANGES
===================================================================
--- branches/branch_5_0/connector-j/CHANGES	2006-12-07 01:01:51 UTC (rev 6131)
+++ branches/branch_5_0/connector-j/CHANGES	2006-12-07 22:06:30 UTC (rev 6132)
@@ -260,7 +260,9 @@
 	
 	- Handle YYYY-MM-DD hh:mm:ss format of timestamp in 
 	  ResultSet.getTimeFromString().
-	  
+	  	  
+	- Fixed BUG#24840 - character encoding of "US-ASCII" doesn't map correctly 
+	  for 4.1 or newer  
 10-19-06 - Version 3.1.14
 
     - Fixed BUG#20479 - Updatable result set throws ClassCastException

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/CharsetMapping.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-12-07
01:01:51 UTC (rev 6131)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-12-07
22:06:30 UTC (rev 6132)
@@ -78,7 +78,7 @@
 			//                           denotes preferred value)      
 			//
 			"US-ASCII =			usa7,"
-	 		+ "US-ASCII =			ascii,"
+	 		+ "US-ASCII =			>4.1.0 ascii,"
 	 		+ "Big5 = 				big5,"
 	 		+ "GBK = 				gbk,"
 	 		+ "SJIS = 				sjis,"

Modified:
branches/branch_5_0/connector-j/src/testsuite/regression/StringRegressionTest.java
===================================================================
---
branches/branch_5_0/connector-j/src/testsuite/regression/StringRegressionTest.java	2006-12-07
01:01:51 UTC (rev 6131)
+++
branches/branch_5_0/connector-j/src/testsuite/regression/StringRegressionTest.java	2006-12-07
22:06:30 UTC (rev 6132)
@@ -882,4 +882,17 @@
 			
 		}
 	}
+	
+	/**
+	 * Tests fix for BUG#24840 - character encoding of "US-ASCII"
+	 * doesn't map correctly for 4.1 or newer
+	 * 
+	 * @throws Exception if the test fails.
+	 */
+	public void testBug24840() throws Exception {
+		Properties props = new Properties();
+		props.setProperty("characterEncoding", "US-ASCII");
+		
+		getConnectionWithProps(props).close();
+	}
 }

Modified: trunk/connector-j/CHANGES
===================================================================
--- trunk/connector-j/CHANGES	2006-12-07 01:01:51 UTC (rev 6131)
+++ trunk/connector-j/CHANGES	2006-12-07 22:06:30 UTC (rev 6132)
@@ -256,7 +256,10 @@
 	
 	- Handle YYYY-MM-DD hh:mm:ss format of timestamp in 
 	  ResultSet.getTimeFromString().
-	
+	  
+	- Fixed BUG#24840 - character encoding of "US-ASCII" doesn't map correctly 
+	  for 4.1 or newer
+	  
 10-19-06 - Version 3.1.14
 
     - Fixed BUG#20479 - Updatable result set throws ClassCastException

Modified: trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-12-07 01:01:51 UTC (rev
6131)
+++ trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-12-07 22:06:30 UTC (rev
6132)
@@ -78,7 +78,7 @@
 			//                           denotes preferred value)      
 			//
 			"US-ASCII =			usa7,"
-	 		+ "US-ASCII =			ascii,"
+	 		+ "US-ASCII =			>4.1.0 ascii,"
 	 		+ "Big5 = 				big5,"
 	 		+ "GBK = 				gbk,"
 	 		+ "SJIS = 				sjis,"

Modified: trunk/connector-j/src/testsuite/regression/StringRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/StringRegressionTest.java	2006-12-07
01:01:51 UTC (rev 6131)
+++ trunk/connector-j/src/testsuite/regression/StringRegressionTest.java	2006-12-07
22:06:30 UTC (rev 6132)
@@ -882,4 +882,17 @@
 			
 		}
 	}
+	
+	/**
+	 * Tests fix for BUG#24840 - character encoding of "US-ASCII"
+	 * doesn't map correctly for 4.1 or newer
+	 * 
+	 * @throws Exception if the test fails.
+	 */
+	public void testBug24840() throws Exception {
+		Properties props = new Properties();
+		props.setProperty("characterEncoding", "US-ASCII");
+		
+		getConnectionWithProps(props).close();
+	}
 }