bzr push into connector-j/branches/branch_5_1 branch (mark:754 to 756)

[mark]

  756 mark@stripped	2008-11-11
      Disable nanos/micros for now
modified:
  src/com/mysql/jdbc/PreparedStatement.java

  755 mark@stripped	2008-11-11
      Wrong result set being dumped
modified:
  src/testsuite/BaseTestCase.java

  754 mark@stripped	2008-11-11
      JDBC-4.0 plumbing for exception interceptors
modified:
  src/com/mysql/jdbc/JDBC4Connection.java
  src/com/mysql/jdbc/JDBC4DatabaseMetaData.java
  src/com/mysql/jdbc/JDBC4DatabaseMetaDataUsingInfoSchema.java
  src/com/mysql/jdbc/JDBC4MysqlSQLXML.java
  src/com/mysql/jdbc/JDBC4NClob.java
  src/com/mysql/jdbc/JDBC4ResultSet.java
  src/com/mysql/jdbc/JDBC4ServerPreparedStatement.java
  src/com/mysql/jdbc/JDBC4UpdatableResultSet.java
  src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.java
  src/com/mysql/jdbc/jdbc2/optional/JDBC4ConnectionWrapper.java
  src/com/mysql/jdbc/jdbc2/optional/JDBC4PreparedStatementWrapper.java
  src/com/mysql/jdbc/jdbc2/optional/JDBC4StatementWrapper.java

=== modified file 'src/com/mysql/jdbc/PreparedStatement.java'
--- a/src/com/mysql/jdbc/PreparedStatement.java	2008-11-11 06:19:59 +0000
+++ b/src/com/mysql/jdbc/PreparedStatement.java	2008-11-11 07:03:11 +0000
@@ -4404,7 +4404,7 @@ public class PreparedStatement extends c
 	}
 	
 	private String formatNanos(int nanos) {
-		if (nanos == 0) {
+		if (true /* for now */ || nanos == 0) {
 		    return "0";
 		}
 		

=== modified file 'src/testsuite/BaseTestCase.java'
--- a/src/testsuite/BaseTestCase.java	2008-11-11 06:18:38 +0000
+++ b/src/testsuite/BaseTestCase.java	2008-11-11 07:02:15 +0000
@@ -710,7 +710,7 @@ public abstract class BaseTestCase exten
 					howMuchMore++;
 					for (int i = 0; i < controlNumCols; i++) {
 						rsAsString.append("\t = \t");
-						rsAsString.append("" + control.getObject(i + 1));
+						rsAsString.append("" + test.getObject(i + 1));
 						rsAsString.append(", ");
 					}
 				}