Modified:
trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
Log:
Post-merge fixups (don't trust tortoise merge again!)
Modified: trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java 2007-09-06 15:12:14 UTC (rev 6567)
+++ trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java 2007-09-06 15:42:38 UTC (rev 6568)
@@ -1952,7 +1952,7 @@
this.conn.prepareCall("{call testBug25624(?,?)}").close();
}
-<<<<<<< .working
+
/**
* Tests fix for BUG#27867 - Schema objects with identifiers other than
Modified: trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java 2007-09-06 15:12:14 UTC (rev 6567)
+++ trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java 2007-09-06 15:42:38 UTC (rev 6568)
@@ -4403,7 +4403,7 @@
this.rs.next();
assertEquals("java.lang.String", this.rs.getObject(1).getClass().getName());
}
-<<<<<<< .working
+
/**
* Tests fix for BUG#30664. Note that this fix only works
@@ -4474,4 +4474,3 @@
}
}
}
->>>>>>> .merge-right.r6543
| Thread |
|---|
| • Connector/J commit: r6568 - trunk/connector-j/src/testsuite/regression | mmatthews | 6 Sep |
