Modified:
trunk/
trunk/connector-j/CHANGES
trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java
Log:
Merged revisions 6615-6625 via svnmerge from
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0
.......
r6617 | mmatthews | 2007-10-04 15:43:49 -0500 (Thu, 04 Oct 2007) | 1 line
Updated release date.
.......
r6624 | mmatthews | 2007-10-05 18:44:33 -0500 (Fri, 05 Oct 2007) | 1 line
Bumped version number.
.......
r6625 | mmatthews | 2007-10-05 18:44:58 -0500 (Fri, 05 Oct 2007) | 1 line
Driver now calls SocketFactory.afterHandshake() at appropriate time.
.......
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/branch_5_0:1-6614 /branches/branch_5_1:1-6582,6584-6615
+ /branches/branch_5_0:1-6625 /branches/branch_5_1:1-6582,6584-6615
Modified: trunk/connector-j/CHANGES
===================================================================
--- trunk/connector-j/CHANGES 2007-10-05 23:44:58 UTC (rev 6625)
+++ trunk/connector-j/CHANGES 2007-10-06 00:06:45 UTC (rev 6626)
@@ -209,8 +209,12 @@
- Added support for JDBC-4.0's NCLOB, and NCHAR/NVARCHAR types.
-nn-nn-07 - Version 5.0.8
+nn-nn-07 - Version 5.0.9
+ - Driver now calls SocketFactory.afterHandshake() at appropriate time.
+
+10-09-07 - Version 5.0.8
+
- Fixed BUG#30550, executeBatch() would fail with an ArithmeticException
and/or NullPointerException when the batch had zero members and
"rewriteBatchedStatements" was set to "true" for the connection.
Modified: trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java 2007-10-05 23:44:58 UTC (rev 6625)
+++ trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java 2007-10-06 00:06:45 UTC (rev 6626)
@@ -1325,6 +1325,12 @@
if (!this.useConnectWithDb) {
changeDatabaseTo(database);
}
+
+ try {
+ this.mysqlConnection = this.socketFactory.afterHandshake();
+ } catch (IOException ioEx) {
+ throw new CommunicationsException(this.connection, this.lastPacketSentTimeMs, ioEx);
+ }
}
private void changeDatabaseTo(String database) throws SQLException {
| Thread |
|---|
| • Connector/J commit: r6626 - in trunk: . connector-j connector-j/src/com/mysql/jdbc | mmatthews | 6 Oct |
