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

[mmatthews]

Modified:
   branches/branch_3_1/connector-j/CHANGES
   branches/branch_3_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java
Log:
Fixed BUG#19724 - Updatable result set fails when server is in ANSI
	  sql_mode.

Modified: branches/branch_3_1/connector-j/CHANGES
===================================================================
--- branches/branch_3_1/connector-j/CHANGES	2006-05-30 19:01:37 UTC (rev 5319)
+++ branches/branch_3_1/connector-j/CHANGES	2006-05-30 19:18:23 UTC (rev 5320)
@@ -112,6 +112,12 @@
 	- Fixed BUG#19282 - ResultSet.wasNull() returns incorrect value 
 	  when extracting native string from server-side prepared statement 
 	  generated result set.
+	  
+	- Fixed BUG#19568 - ResultSet.getSomeNumeric() didn't work for the
+	  BIT type.
+	  
+	- Fixed BUG#19724 - Updatable result set fails when server is in ANSI
+	  sql_mode.
 
 11-30-05 - Version 3.1.12
 

Modified: branches/branch_3_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java
===================================================================
--- branches/branch_3_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2006-05-30
19:01:37 UTC (rev 5319)
+++ branches/branch_3_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2006-05-30
19:18:23 UTC (rev 5320)
@@ -190,10 +190,9 @@
 				if (!inQuotes && (quotedIdentifierChar != 0)
 						&& (c == quotedIdentifierChar)) {
 					inQuotedId = !inQuotedId;
-				}
-
-				// only respect quotes when not in a quoted identifier
-				if (!inQuotedId) {
+				} else if (!inQuotedId) {
+					//	only respect quotes when not in a quoted identifier
+					
 					if (inQuotes) {
 						if ((((c == '\'') || (c == '"')) && c == quoteChar)
 								&& (pre1 == '\\') && (pre2 != '\\')) {