Connector/J commit: r6578 - in trunk: . connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   trunk/
   trunk/connector-j/src/com/mysql/jdbc/Field.java
   trunk/connector-j/src/com/mysql/jdbc/ResultSetImpl.java
Log:
Merged revisions 6576-6577 via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_1

.......
  r6576 | mmatthews | 2007-09-07 11:11:05 -0500 (Fri, 07 Sep 2007) | 1 line
  
  Deal with stored procedures using user variables, and thus calling byteArrayToBoolean() when we're really dealing with an ASCII string but can't tell (so look for '1' and '0' first).
.......
  r6577 | mmatthews | 2007-09-07 11:12:04 -0500 (Fri, 07 Sep 2007) | 1 line
  
  Added charset information to .toString() output.
.......



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/branch_5_0:1-6572 /branches/branch_5_1:1-6566
   + /branches/branch_5_0:1-6572 /branches/branch_5_1:1-6566,6576-6577

Modified: trunk/connector-j/src/com/mysql/jdbc/Field.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/Field.java	2007-09-07 16:12:04 UTC (rev 6577)
+++ trunk/connector-j/src/com/mysql/jdbc/Field.java	2007-09-07 16:36:32 UTC (rev 6578)
@@ -1004,7 +1004,12 @@
 				asString.append(" ZEROFILL");
 			}
 
+			asString.append(", charsetIndex=");
+			asString.append(this.charsetIndex);
+			asString.append(", charsetName=");
+			asString.append(this.charsetName);
 			
+			
 			//if (this.buffer != null) {
 			//	asString.append("\n\nData as received from server:\n\n");
 			//	asString.append(StringUtils.dumpAsHex(this.buffer,

Modified: trunk/connector-j/src/com/mysql/jdbc/ResultSetImpl.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/ResultSetImpl.java	2007-09-07 16:12:04 UTC (rev 6577)
+++ trunk/connector-j/src/com/mysql/jdbc/ResultSetImpl.java	2007-09-07 16:36:32 UTC (rev 6578)
@@ -1645,6 +1645,12 @@
 
 		byte boolVal = ((byte[]) value)[0];
 
+		if (boolVal == (byte)'1') {
+			return true;
+		} else if (boolVal == (byte)'0') {
+			return false;
+		}
+		
 		return (boolVal == -1 || boolVal > 0);
 	}