db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1042685 - in /db/derby/code/branches/10.7: ./ java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
Date Mon, 06 Dec 2010 15:52:58 GMT
Author: kristwaa
Date: Mon Dec  6 15:52:58 2010
New Revision: 1042685

URL: http://svn.apache.org/viewvc?rev=1042685&view=rev
Log:
DERBY-4912: Instability in Derby2017LayerBTest

Merged fix from trunk (r1038514).

Modified:
    db/derby/code/branches/10.7/   (props changed)
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java

Propchange: db/derby/code/branches/10.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  6 15:52:58 2010
@@ -1 +1 @@
-/db/derby/code/trunk:1035603,1036769,1038813,1039084,1039268,1040658,1041338
+/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338

Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java?rev=1042685&r1=1042684&r2=1042685&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
(original)
+++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
Mon Dec  6 15:52:58 2010
@@ -400,7 +400,7 @@ public class Derby2017LayerBTest
 
         // Select data in the table, compare to MASTER
         ResultSet rs = stmt.executeQuery("select * from t2017");
-        JDBC.assertFullResultSet(rs, MASTER);
+        JDBC.assertUnorderedResultSet(rs, MASTER);
     }
 
     /**
@@ -490,7 +490,7 @@ public class Derby2017LayerBTest
 
         // Select data in the table, compare to MASTER
         ResultSet rs = stmt.executeQuery("select * from t2017_binary");
-        JDBC.assertFullResultSet(rs, MASTER);
+        JDBC.assertUnorderedResultSet(rs, MASTER);
     }
 
     /**



Mime
View raw message