Modified:
trunk/src/com/mysql/jdbc/PreparedStatement.java
trunk/src/testsuite/regression/StatementRegressionTest.java
Log:
Post-merge fixups.
Modified: trunk/src/com/mysql/jdbc/PreparedStatement.java
===================================================================
--- trunk/src/com/mysql/jdbc/PreparedStatement.java 2007-11-16 16:53:29 UTC (rev 6668)
+++ trunk/src/com/mysql/jdbc/PreparedStatement.java 2007-11-17 01:34:43 UTC (rev 6669)
@@ -3389,7 +3389,8 @@
parameterAsNum = parameterAsBoolean ? Constants.integerValueOf(1)
: Constants.integerValueOf(0);
-
+ }
+
break;
case Types.TINYINT:
Modified: trunk/src/testsuite/regression/StatementRegressionTest.java
===================================================================
--- trunk/src/testsuite/regression/StatementRegressionTest.java 2007-11-16 16:53:29 UTC (rev 6668)
+++ trunk/src/testsuite/regression/StatementRegressionTest.java 2007-11-17 01:34:43 UTC (rev 6669)
@@ -4152,7 +4152,6 @@
closeMemberJDBCResources();
}
}
-}
public void testLancesBitMappingBug() throws Exception {
if (!versionMeetsMinimum(5, 0)) {
| Thread |
|---|
| • Connector/J commit: r6669 - in trunk/src: com/mysql/jdbc testsuite/regression | mmatthews | 17 Nov |