From: Date: September 7 2007 4:01pm
Subject: Connector/J commit: r6573 - in trunk: . connector-j connector-j/src/com/mysql/jdbc/jdbc2/optional
List-Archive: http://lists.mysql.com/commits/33908
X-Bug: 30892
Message-Id: <200709071401.l87E1krS030614@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   trunk/
   trunk/connector-j/CHANGES
   trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
Log:
Merged revisions 6570-6572 via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0

.......
  r6572 | mmatthews | 2007-09-07 08:48:19 -0500 (Fri, 07 Sep 2007) | 2 lines
  
  - Fixed Bug#30892 setObject(int, Object, int, int) delegate in
  
        PreparedStatmentWrapper delegates to wrong method.
.......



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

Modified: trunk/connector-j/CHANGES
===================================================================
--- trunk/connector-j/CHANGES	2007-09-07 13:48:19 UTC (rev 6572)
+++ trunk/connector-j/CHANGES	2007-09-07 14:01:45 UTC (rev 6573)
@@ -259,6 +259,9 @@
       lighter weight), and when using a ReplicationConnection or a LoadBalancedConnection, 
       will send the ping across all active connections.
       
+    - Fixed Bug#30892 setObject(int, Object, int, int) delegate in
+      PreparedStatmentWrapper delegates to wrong method.
+      
 07-19-07 - Version 5.0.7
 
     - Setting the configuration parameter "useCursorFetch" to "true" for

Modified: trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java	2007-09-07 13:48:19 UTC (rev 6572)
+++ trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java	2007-09-07 14:01:45 UTC (rev 6573)
@@ -511,7 +511,7 @@
 		try {
 			if (this.wrappedStmt != null) {
 				((PreparedStatement) this.wrappedStmt).setObject(
-						parameterIndex, x, scale);
+						parameterIndex, x, targetSqlType, scale);
 			} else {
 				throw SQLError.createSQLException(
 						"No operations allowed after statement closed",