Modified:
trunk/
trunk/CHANGES
trunk/src/testsuite/regression/StatementRegressionTest.java
Log:
Merged revisions 6585-6586,6593-6597,6599-6602,6605,6607-6609,6612,6614-6617,6619-6620,6623-6627,6632,6636-6638,6641,6649,6658-6659,6663,6665-6673,6676,6681-6682,6684,6686,6688,6690-6691,6693,6698,6707,6709-6713,6718,6720-6721 via svnmerge from
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_1
.......
r6721 | mmatthews | 2008-01-31 00:25:29 -0600 (Thu, 31 Jan 2008) | 1 line
Fixed typo in bug # for Bug#34093
.......
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/branch_5_0:1-6636,6638-6670 /branches/branch_5_1:1-6582,6584-6678,6680-6719
+ /branches/branch_5_0:1-6636,6638-6670 /branches/branch_5_1:1-6582,6584-6678,6680-6721
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2008-01-31 06:25:29 UTC (rev 6721)
+++ trunk/CHANGES 2008-01-31 06:41:38 UTC (rev 6722)
@@ -115,7 +115,7 @@
trace as a string into the message, set the underlying Throwable as the cause for
the SQLException, making it accessible via getCause().
- - Fixed BUG#30493 - Statements with batched values do not return correct values for
+ - Fixed BUG#34093 - Statements with batched values do not return correct values for
getGeneratedKeys() when "rewriteBatchedStatements" is set to "true", and the
statement has an "ON DUPLICATE KEY UPDATE" clause.
Modified: trunk/src/testsuite/regression/StatementRegressionTest.java
===================================================================
--- trunk/src/testsuite/regression/StatementRegressionTest.java 2008-01-31 06:25:29 UTC (rev 6721)
+++ trunk/src/testsuite/regression/StatementRegressionTest.java 2008-01-31 06:41:38 UTC (rev 6722)
@@ -5293,13 +5293,13 @@
}
/**
- * Tests fix for BUG#30493 - Statements with batched values do not
+ * Tests fix for BUG#34093 - Statements with batched values do not
* return correct values for getGeneratedKeys() when "rewriteBatchedStatements"
* is set to "true", and the statement has an "ON DUPLICATE KEY UPDATE" clause.
*
* @throws Exception if the test fails.
*/
- public void testBug30493() throws Exception {
+ public void testBug34093() throws Exception {
Connection rewriteConn = null;
try {
| Thread |
|---|
| • Connector/J commit: r6722 - in trunk: . src/testsuite/regression | mmatthews | 31 Jan |
