MySQL Lists: commits: Connector/J commit: r6598 - in branches/branch_5_1: . connector-j connector-j/src/com/mysql/jdbc connector-j/src/com/mysql/jdbc/jdbc2/optional connect...

List:	Commits	« Previous Message Next Message »
From:	mmatthews	Date:	October 2 2007 9:55pm
Subject:	Connector/J commit: r6598 - in branches/branch_5_1: . connector-j connector-j/src/com/mysql/jdbc connector-j/src/com/mysql/jdbc/jdbc2/optional connect...
View as plain text
Modified:
   branches/branch_5_1/
   branches/branch_5_1/connector-j/CHANGES
   branches/branch_5_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java
  
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
   branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.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-6597
via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/trunk

...............
  r6578 | mmatthews | 2007-09-07 11:36:32 -0500 (Fri, 07 Sep 2007) | 13 lines
  
  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.
  ........
...............
  r6585 | mmatthews | 2007-09-11 23:02:40 -0500 (Tue, 11 Sep 2007) | 9 lines
  
  Merged revisions 6584 via svnmerge from 
 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_1
  
  ........
    r6584 | mcbrown | 2007-09-11 09:28:15 -0500 (Tue, 11 Sep 2007) | 3 lines
    
    Fixing the description of jdbcCompliantTruncation
  ........
...............
  r6586 | mmatthews | 2007-09-11 23:03:37 -0500 (Tue, 11 Sep 2007) | 8 lines
  
  Blocked revisions 6583 via svnmerge
  
  ........
    r6583 | mmatthews | 2007-09-10 12:47:08 -0500 (Mon, 10 Sep 2007) | 1 line
    
    Bumped version #.
  ........
...............
  r6593 | mmatthews | 2007-09-26 07:02:47 -0500 (Wed, 26 Sep 2007) | 43 lines
  
  Merged revisions 6587-6592 via svnmerge from 
 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_1
  
  ........
    r6587 | mmatthews | 2007-09-15 15:58:27 -0500 (Sat, 15 Sep 2007) | 6 lines
    
     Added "autoSlowLog" configuration property, overrides 
    
          "slowQueryThreshold*" properties, driver determines slow
    
          queries by those that are slower than 5 * stddev of the mean
    
          query time (outside the 96% percentile).
    
    
    
    Externalized some utf-8 related connection property descriptions.
  ........
    r6588 | mmatthews | 2007-09-15 16:01:29 -0500 (Sat, 15 Sep 2007) | 3 lines
    
    Only update row "validity" on navigation, reduces time spent in value retrieval when
seeing if we're on a valid row or not.
    
    
    
    Moved a hot method call (to get a configuration that stays the same for the lifetime
of a connection) to a field that is set during instantiation.
  ........
    r6589 | mmatthews | 2007-09-15 21:05:52 -0500 (Sat, 15 Sep 2007) | 1 line
    
    Added mapings for new 4-byte utf8, utf16 and utf32 collations/charsets for 5.2/6.0
server.
  ........
    r6590 | mmatthews | 2007-09-26 05:28:04 -0500 (Wed, 26 Sep 2007) | 1 line
    
    Added ability to hook into connection lifecycle events via an extension interface.
  ........
    r6591 | mmatthews | 2007-09-26 05:30:30 -0500 (Wed, 26 Sep 2007) | 1 line
    
    Added actual interface you need to _implement_ for StatementInterceptors.
  ........
    r6592 | mmatthews | 2007-09-26 06:44:41 -0500 (Wed, 26 Sep 2007) | 1 line
    
    Clarification of utf-8 blob mappings for the TINYBLOB type.
  ........
...............
  r6596 | mmatthews | 2007-10-02 14:46:56 -0500 (Tue, 02 Oct 2007) | 9 lines
  
  Merged revisions 6594 via svnmerge from 
 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0
  
  ........
    r6594 | mmatthews | 2007-10-01 10:14:53 -0500 (Mon, 01 Oct 2007) | 1 line
    
    XAConnections now start in auto-commit mode (as per JDBC-4.0 specification
clarification).
  ........
...............
  r6597 | mmatthews | 2007-10-02 14:49:47 -0500 (Tue, 02 Oct 2007) | 16 lines
  
  Merged revisions 6573-6593,6595-6596 via svnmerge from 
 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0
  
  ........
    r6579 | mmatthews | 2007-09-07 12:31:06 -0500 (Fri, 07 Sep 2007) | 2 lines
    
    Blocked revisions
3986-3990,4009-4020,4024,4046,4050,4053-4058,4067,4095,4097-4098,4122-4130,4135,4159-4160,4162,4164-4165,4178,4209,4243-4245,4256-4258,4265,4287,4291,4296-4297,4307-4308,4336,4354-4358,4374,4378,4388-4389,4420,4471,4500,4503,4505,4523,4533,4553,4558-4559,4564-4565,4567,4580,4586-4587,4590,4592-4593,4595-4596,4601,4618-4619,4621,4623,4626-4627,4637,4662-4663,4680,4705,4707,4709,4715,4717-4718,4720,4722-4723,4773,4815,4819-4822,4873,4887,4906,4945,4971,4983-4984,5024,5034-5037,5040,5044,5052,5120-5125,5127-5129,5184-5185,5187-5188,5207,5247,5312-5323,5327,5332,5335,5389,5391-5393,5400-5401,5403,5446,5511,5524,5526,5530-5531,5554-5555,5639,5682,5833,5850,5852-5853,5866,5888-5892,5898-5900,5907,5917,5935,6035,6083,6095-6096,6132,6307,6348,6371,6427,6436,6444,6493
via svnmerge
    [removed log messages to not trip up the bugs system]
  ........
    r6595 | mmatthews | 2007-10-02 14:36:55 -0500 (Tue, 02 Oct 2007) | 2 lines
    
    Fixed Bug#27412 - cached metadata with PreparedStatement.execute()
    
          throws NullPointerException.
  ........
...............



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-6574
   +
/trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6597

Modified: branches/branch_5_1/connector-j/CHANGES
===================================================================
--- branches/branch_5_1/connector-j/CHANGES	2007-10-02 19:49:47 UTC (rev 6597)
+++ branches/branch_5_1/connector-j/CHANGES	2007-10-02 19:55:49 UTC (rev 6598)
@@ -268,6 +268,12 @@
     - Fixed Bug#30892 setObject(int, Object, int, int) delegate in
       PreparedStatmentWrapper delegates to wrong method.
       
+    - XAConnections now start in auto-commit mode (as per JDBC-4.0 specification
+      clarification).
+     
+    - Fixed Bug#27412 - cached metadata with PreparedStatement.execute()
+      throws NullPointerException.
+       
 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/PreparedStatement.java
===================================================================
--- branches/branch_5_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2007-10-02
19:49:47 UTC (rev 6597)
+++ branches/branch_5_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2007-10-02
19:55:49 UTC (rev 6598)
@@ -1006,7 +1006,7 @@
 			} else {
 				if (rs.reallyResult() && locallyScopedConn.getCacheResultSetMetadata()) {
 					locallyScopedConn.initializeResultsMetadataFromCache(this.originalSql,
-							null /* will be created */, this.results);
+							null /* will be created */, rs);
 				}
 			}
 			

Modified:
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
===================================================================
---
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java	2007-10-02
19:49:47 UTC (rev 6597)
+++
branches/branch_5_1/connector-j/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java	2007-10-02
19:55:49 UTC (rev 6598)
@@ -127,7 +127,6 @@
 		
 		if (this.isForXa) {
 			setInGlobalTx(false);
-			setAutoCommit(false);
 		}
 	}
 

Modified:
branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.java
===================================================================
---
branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-10-02
19:49:47 UTC (rev 6597)
+++
branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-10-02
19:55:49 UTC (rev 6598)
@@ -47,10 +47,8 @@
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
-import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.Properties;
@@ -3176,6 +3174,7 @@
 		return isJdbc4;
 	}
 
+	
 	/**
 	 * Tests fix for BUG#19615, PreparedStatement.setObject(int, Object, int)
 	 * doesn't respect scale of BigDecimals.
@@ -4075,4 +4074,29 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+	
+	/**
+	 * Tests fix for Bug#27412 - cached metadata with PreparedStatement.execute()
+	 * throws NullPointerException.
+	 * 
+	 * @throws Exception
+	 */
+	public void testBug27412() throws Exception {
+		try {
+			Properties props = new Properties();
+			props.put("useServerPrepStmts", "false");
+			props.put("cachePreparedStatements", "true");
+			props.put("cacheResultSetMetadata", "true");
+			Connection conn2 = getConnectionWithProps(props);
+			PreparedStatement pstm = conn2.prepareStatement("SELECT 1");
+			try {
+				assertTrue(pstm.execute());
+			} finally {
+				pstm.close();
+				conn2.close();
+			}
+		} finally {
+			closeMemberJDBCResources();
+		}
+	}
+}
Thread
• Connector/J commit: r6598 - in branches/branch_5_1: . connector-j connector-j/src/com/mysql/jdbc connector-j/src/com/mysql/jdbc/jdbc2/optional connect...	mmatthews	2 Oct