Connector/J commit: r6766 - in branches/branch_5_1: . src/com/mysql/jdbc src/testsuite/regression

[mmatthews]

Modified:
   branches/branch_5_1/CHANGES
   branches/branch_5_1/src/com/mysql/jdbc/StatementImpl.java
   branches/branch_5_1/src/testsuite/regression/StatementRegressionTest.java
Log:
Fixed BUG#35666 - NullPointerException when using "logSlowQueries=true" with
	  server-side prepared statements enabled.

Modified: branches/branch_5_1/CHANGES
===================================================================
--- branches/branch_5_1/CHANGES	2008-03-31 14:45:34 UTC (rev 6765)
+++ branches/branch_5_1/CHANGES	2008-03-31 14:56:21 UTC (rev 6766)
@@ -12,6 +12,9 @@
 	  columns and is opened with CONCUR_UPDATABLE, don't throw SQLExceptions when
 	  checking updatability due to access permissions, instead return
 	  CONCUR_READONLY from getConcurrency.
+	  
+	- Fixed BUG#35666 - NullPointerException when using "logSlowQueries=true" with
+	  server-side prepared statements enabled.
 	    
 03-06-08 - Version 5.1.6
 

Modified: branches/branch_5_1/src/com/mysql/jdbc/StatementImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/StatementImpl.java	2008-03-31 14:45:34 UTC (rev
6765)
+++ branches/branch_5_1/src/com/mysql/jdbc/StatementImpl.java	2008-03-31 14:56:21 UTC (rev
6766)
@@ -297,7 +297,7 @@
 		}
 
 		boolean profiling = this.connection.getProfileSql()
-				|| this.connection.getUseUsageAdvisor();
+				|| this.connection.getUseUsageAdvisor() || this.connection.getLogSlowQueries();
 
 		if (this.connection.getAutoGenerateTestcaseScript() || profiling) {
 			this.statementId = statementCounter++;

Modified: branches/branch_5_1/src/testsuite/regression/StatementRegressionTest.java
===================================================================
--- branches/branch_5_1/src/testsuite/regression/StatementRegressionTest.java	2008-03-31
14:45:34 UTC (rev 6765)
+++ branches/branch_5_1/src/testsuite/regression/StatementRegressionTest.java	2008-03-31
14:56:21 UTC (rev 6766)
@@ -5438,4 +5438,10 @@
 		
 		this.stmt.executeUpdate("INSERT INTO testBug35307 (field) values ('works')");
 	}
+	
+	public void testBug35666() throws Exception {
+		Connection loggingConn = getConnectionWithProps("logSlowQueries=true");
+		this.pstmt = ((com.mysql.jdbc.Connection) loggingConn).serverPrepareStatement("SELECT
SLEEP(4)");
+		this.pstmt.execute();
+	}
  } 
\ No newline at end of file