db-derby-commits mailing list archives

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

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

Merged fix from trunk (r1038514).

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

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  6 15:53:19 2010
@@ -1,2 +1,2 @@
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426,1025795,1028716,1030043,1033864,1040658
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426,1025795,1028716,1030043,1033864,1038514,1040658
 /db/derby/docs/trunk:954344

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java?rev=1042686&r1=1042685&r2=1042686&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
Mon Dec  6 15:53:19 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