Author: rhillegas
Date: Mon Jun 22 16:08:22 2009
New Revision: 787302

URL: http://svn.apache.org/viewvc?rev=787302&view=rev
Log:
DERBY-4281: Committed Bryan's patch enabling the 10.6 upgrade tests.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=787302&r1=787301&r2=787302&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Mon Jun 22 16:08:22 2009
@@ -481,7 +481,7 @@
 	public void boot(boolean create, Properties startParams) 
 			throws StandardException
 	{
-		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_5);
+		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_6);
 
 		startupParameters = startParams;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java?rev=787302&r1=787301&r2=787302&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java Mon Jun 22 16:08:22 2009
@@ -190,8 +190,8 @@
                 	suite.addTest(Changes10_4.suite(phase));
                 if (oldMinor < 5)
                 	suite.addTest(Changes10_5.suite(phase));
-                //if (oldMinor < 6)
-                //	suite.addTest(Changes10_6.suite(phase));
+                if (oldMinor < 6)
+                	suite.addTest(Changes10_6.suite(phase));
             }
             
             // Add DatabaseMetaData tests. Since metadata