db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1597853 - in /db/derby/code/branches/10.8: ./ java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Date Tue, 27 May 2014 19:20:48 GMT
Author: mamta
Date: Tue May 27 19:20:48 2014
New Revision: 1597853

URL: http://svn.apache.org/r1597853
Log:
DERBY-6547(testDERBY5120NumRowsInSydependsForTrigger fails when the starting version of the
upgrade trajectory is 10.10.2.0)

 Backporting from trunk to 10.8


Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1596451

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1597853&r1=1597852&r2=1597853&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Tue May 27 19:20:48 2014
@@ -473,20 +473,20 @@ public class BasicSetup extends UpgradeC
         	//During the path back to original release, all the spses get
         	// marked invalid and hence they will be regenerated during 
         	// the next time they get fired. This regeneration will cause
-        	// the dependency between trigger action sps and trigger table
+        	// the dependency between trigger action sps and trigger table 
         	// be dropped except in 10.8.2.2 and higher releases where
         	// DERBY-5120 has already been fixed.
             assertStatementError("42802", s, " update ATDC_TAB1 set c11=2");
 
         	preapreFortDERBY5120();
-            s.execute("update ATDC_TAB1 set c12=11");
+            s.execute("update ATDC_TAB1 set c11=11");
             s.executeUpdate("alter table ATDC_TAB1 add column c113 int");
             //DERBY-5120 has been fixed in 10.8.2.2 and higher and hence we 
             // will not see the buggy behavior on those codelines
             if (oldLessThan(10,8,2,2)) 
-                s.execute("update ATDC_TAB1 set c12=11");
+                s.execute("update ATDC_TAB1 set c11=11");
             else
-                assertStatementError("42802", s, " update ATDC_TAB1 set c12=11");       
    
+                assertStatementError("42802", s, " update ATDC_TAB1 set c11=11");       
    
         	break;
 
         case PH_POST_HARD_UPGRADE:



Mime
View raw message