Connector/J commit: r6575 - in branches/branch_5_1: . connector-j connector-j/src/com/mysql/jdbc/jdbc2/optional

[mmatthews]

Modified:
   branches/branch_5_1/
   branches/branch_5_1/connector-j/CHANGES
  
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
Log:
Merged revisions
6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6522,6524,6526-6528,6530-6531,6533-6534,6536-6537,6539-6540,6543-6545,6547,6549-6550,6552-6555,6557-6564,6566,6569,6572-6574
via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/trunk

...............
  r6573 | mmatthews | 2007-09-07 09:01:45 -0500 (Fri, 07 Sep 2007) | 11 lines
  
  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: branches/branch_5_1
___________________________________________________________________
Name: svnmerge-integrated
   -
/trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6571
   +
/trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6574

Modified: branches/branch_5_1/connector-j/CHANGES
===================================================================
--- branches/branch_5_1/connector-j/CHANGES	2007-09-07 14:03:45 UTC (rev 6574)
+++ branches/branch_5_1/connector-j/CHANGES	2007-09-07 14:12:54 UTC (rev 6575)
@@ -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:
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
===================================================================
---
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java	2007-09-07
14:03:45 UTC (rev 6574)
+++
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java	2007-09-07
14:12:54 UTC (rev 6575)
@@ -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",