db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r428115 [1/2] - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/sql/dictionary/ engine/org/apache/derby/impl/sql/catalog/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/...
Date Wed, 02 Aug 2006 19:49:01 GMT
Author: djd
Date: Wed Aug  2 12:48:59 2006
New Revision: 428115

URL: http://svn.apache.org/viewvc?rev=428115&view=rev
Log:
DERBY-1579 Remove SYS.SYSREQUIREDPERM system table and update all the associated master output files.

Patch contributed by Yip Ng yipng168@gmail.com

Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/RequiredPermDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSREQUIREDPERMRowFactory.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/views.out

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Wed Aug  2 12:48:59 2006
@@ -157,7 +157,6 @@
 	public static final int SYSTABLEPERMS_CATALOG_NUM = 16;
 	public static final int SYSCOLPERMS_CATALOG_NUM = 17;
 	public static final int SYSROUTINEPERMS_CATALOG_NUM = 18;
-	public static final int SYSREQUIREDPERM_CATALOG_NUM = 19;
 
 	/* static finals for constraints 
 	 * (Here because they are needed by parser, compilation and execution.)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Wed Aug  2 12:48:59 2006
@@ -370,7 +370,6 @@
 			bootingDictionary.upgradeMakeCatalog(tc, DataDictionary.SYSTABLEPERMS_CATALOG_NUM);
 			bootingDictionary.upgradeMakeCatalog(tc, DataDictionary.SYSCOLPERMS_CATALOG_NUM);
 			bootingDictionary.upgradeMakeCatalog(tc, DataDictionary.SYSROUTINEPERMS_CATALOG_NUM);
-			bootingDictionary.upgradeMakeCatalog(tc, DataDictionary.SYSREQUIREDPERM_CATALOG_NUM);
 
 			// Change system schemas to be owned by aid
 			bootingDictionary.updateSystemSchemaAuthorization(aid, tc);

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=428115&r1=428114&r2=428115&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 Wed Aug  2 12:48:59 2006
@@ -295,8 +295,7 @@
 									"SYSDUMMY1",
                                     "SYSTABLEPERMS",
                                     "SYSCOLPERMS",
-                                    "SYSROUTINEPERMS",
-                                    "SYSREQUIREDPERM"
+                                    "SYSROUTINEPERMS"
 									};
 
 	private	static final int		NUM_NONCORE = nonCoreNames.length;
@@ -7838,11 +7837,6 @@
 
 			  case SYSROUTINEPERMS_CATALOG_NUM:
 				retval = new TabInfoImpl(new SYSROUTINEPERMSRowFactory(
-												 luuidFactory, exFactory, dvf, convertIdToLower));					 
-				break;
-
-			  case SYSREQUIREDPERM_CATALOG_NUM:
-				retval = new TabInfoImpl(new SYSREQUIREDPERMRowFactory(
 												 luuidFactory, exFactory, dvf, convertIdToLower));					 
 				break;
 			}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Wed Aug  2 12:48:59 2006
@@ -236,7 +236,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -258,7 +257,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Wed Aug  2 12:48:59 2006
@@ -266,7 +266,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -288,7 +287,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out Wed Aug  2 12:48:59 2006
@@ -60,7 +60,6 @@
 SYSFILES |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSFOREIGNKEYS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSKEYS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
-SYSREQUIREDPERM |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSROUTINEPERMS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSSCHEMAS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSSTATEMENTS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
@@ -98,7 +97,6 @@
 SYSFOREIGNKEYS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSFOREIGNKEYS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSKEYS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
-SYSREQUIREDPERM_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX3 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
@@ -130,7 +128,6 @@
 SYSFILES |S
 SYSFOREIGNKEYS |S
 SYSKEYS |S
-SYSREQUIREDPERM |S
 SYSROUTINEPERMS |S
 SYSSCHEMAS |S
 SYSSTATEMENTS |S
@@ -205,11 +202,6 @@
 SYSFOREIGNKEYS |UPDATERULE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSKEYS |CONGLOMERATEID |2 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSKEYS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-SYSREQUIREDPERM |OBJECT |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATOR |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATORTYPE |2 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-SYSREQUIREDPERM |PERMTYPE |3 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSROUTINEPERMS |ALIASID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSROUTINEPERMS |GRANTEE |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSROUTINEPERMS |GRANTOPTION |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
@@ -310,8 +302,6 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
-SYSREQUIREDPERM |0     
-SYSREQUIREDPERM |1     
 SYSROUTINEPERMS |0     
 SYSROUTINEPERMS |1     
 SYSROUTINEPERMS |1     
@@ -353,7 +343,6 @@
 SYSFILES |S
 SYSFOREIGNKEYS |S
 SYSKEYS |S
-SYSREQUIREDPERM |S
 SYSROUTINEPERMS |S
 SYSSCHEMAS |S
 SYSSTATEMENTS |S
@@ -429,11 +418,6 @@
 SYSFOREIGNKEYS |UPDATERULE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSKEYS |CONGLOMERATEID |2 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSKEYS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-SYSREQUIREDPERM |OBJECT |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATOR |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATORTYPE |2 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-SYSREQUIREDPERM |PERMTYPE |3 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSROUTINEPERMS |ALIASID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSROUTINEPERMS |GRANTEE |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSROUTINEPERMS |GRANTOPTION |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
@@ -536,8 +520,6 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
-SYSREQUIREDPERM |0     
-SYSREQUIREDPERM |1     
 SYSROUTINEPERMS |0     
 SYSROUTINEPERMS |1     
 SYSROUTINEPERMS |1     
@@ -713,7 +695,6 @@
 SYSFILES |1          
 SYSFOREIGNKEYS |1          
 SYSKEYS |1          
-SYSREQUIREDPERM |1          
 SYSROUTINEPERMS |1          
 SYSSCHEMAS |1          
 SYSSTATEMENTS |1          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out Wed Aug  2 12:48:59 2006
@@ -329,7 +329,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -351,7 +350,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out Wed Aug  2 12:48:59 2006
@@ -60,7 +60,6 @@
 SYSFILES |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSFOREIGNKEYS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSKEYS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
-SYSREQUIREDPERM |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSROUTINEPERMS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSSCHEMAS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSSTATEMENTS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
@@ -98,7 +97,6 @@
 SYSFOREIGNKEYS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSFOREIGNKEYS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSKEYS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
-SYSREQUIREDPERM_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX3 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
@@ -130,7 +128,6 @@
 SYSFILES |S
 SYSFOREIGNKEYS |S
 SYSKEYS |S
-SYSREQUIREDPERM |S
 SYSROUTINEPERMS |S
 SYSSCHEMAS |S
 SYSSTATEMENTS |S
@@ -205,11 +202,6 @@
 SYSFOREIGNKEYS |UPDATERULE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSKEYS |CONGLOMERATEID |2 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSKEYS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-SYSREQUIREDPERM |OBJECT |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATOR |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATORTYPE |2 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-SYSREQUIREDPERM |PERMTYPE |3 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSROUTINEPERMS |ALIASID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSROUTINEPERMS |GRANTEE |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSROUTINEPERMS |GRANTOPTION |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
@@ -310,8 +302,6 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
-SYSREQUIREDPERM |0     
-SYSREQUIREDPERM |1     
 SYSROUTINEPERMS |0     
 SYSROUTINEPERMS |1     
 SYSROUTINEPERMS |1     
@@ -353,7 +343,6 @@
 SYSFILES |S
 SYSFOREIGNKEYS |S
 SYSKEYS |S
-SYSREQUIREDPERM |S
 SYSROUTINEPERMS |S
 SYSSCHEMAS |S
 SYSSTATEMENTS |S
@@ -429,11 +418,6 @@
 SYSFOREIGNKEYS |UPDATERULE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSKEYS |CONGLOMERATEID |2 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSKEYS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-SYSREQUIREDPERM |OBJECT |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATOR |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATORTYPE |2 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-SYSREQUIREDPERM |PERMTYPE |3 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSROUTINEPERMS |ALIASID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSROUTINEPERMS |GRANTEE |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSROUTINEPERMS |GRANTOPTION |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
@@ -536,8 +520,6 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
-SYSREQUIREDPERM |0     
-SYSREQUIREDPERM |1     
 SYSROUTINEPERMS |0     
 SYSROUTINEPERMS |1     
 SYSROUTINEPERMS |1     
@@ -650,7 +632,6 @@
 SYSFILES |1          
 SYSFOREIGNKEYS |1          
 SYSKEYS |1          
-SYSREQUIREDPERM |1          
 SYSROUTINEPERMS |1          
 SYSSCHEMAS |1          
 SYSSTATEMENTS |1          
@@ -733,7 +714,6 @@
 SYSFILES |1          
 SYSFOREIGNKEYS |1          
 SYSKEYS |1          
-SYSREQUIREDPERM |1          
 SYSROUTINEPERMS |1          
 SYSSCHEMAS |1          
 SYSSTATEMENTS |1          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Wed Aug  2 12:48:59 2006
@@ -329,7 +329,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -351,7 +350,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Wed Aug  2 12:48:59 2006
@@ -359,7 +359,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -381,7 +380,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out Wed Aug  2 12:48:59 2006
@@ -60,7 +60,6 @@
 SYSFILES |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSFOREIGNKEYS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSKEYS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
-SYSREQUIREDPERM |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSROUTINEPERMS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSSCHEMAS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSSTATEMENTS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
@@ -98,7 +97,6 @@
 SYSFOREIGNKEYS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSFOREIGNKEYS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSKEYS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
-SYSREQUIREDPERM_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSROUTINEPERMS_INDEX3 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
@@ -130,7 +128,6 @@
 SYSFILES |S
 SYSFOREIGNKEYS |S
 SYSKEYS |S
-SYSREQUIREDPERM |S
 SYSROUTINEPERMS |S
 SYSSCHEMAS |S
 SYSSTATEMENTS |S
@@ -205,11 +202,6 @@
 SYSFOREIGNKEYS |UPDATERULE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSKEYS |CONGLOMERATEID |2 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSKEYS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-SYSREQUIREDPERM |OBJECT |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATOR |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATORTYPE |2 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-SYSREQUIREDPERM |PERMTYPE |3 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSROUTINEPERMS |ALIASID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSROUTINEPERMS |GRANTEE |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSROUTINEPERMS |GRANTOPTION |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
@@ -310,8 +302,6 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
-SYSREQUIREDPERM |0     
-SYSREQUIREDPERM |1     
 SYSROUTINEPERMS |0     
 SYSROUTINEPERMS |1     
 SYSROUTINEPERMS |1     
@@ -353,7 +343,6 @@
 SYSFILES |S
 SYSFOREIGNKEYS |S
 SYSKEYS |S
-SYSREQUIREDPERM |S
 SYSROUTINEPERMS |S
 SYSSCHEMAS |S
 SYSSTATEMENTS |S
@@ -429,11 +418,6 @@
 SYSFOREIGNKEYS |UPDATERULE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSKEYS |CONGLOMERATEID |2 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSKEYS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-SYSREQUIREDPERM |OBJECT |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATOR |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-SYSREQUIREDPERM |OPERATORTYPE |2 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-SYSREQUIREDPERM |PERMTYPE |3 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSROUTINEPERMS |ALIASID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSROUTINEPERMS |GRANTEE |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSROUTINEPERMS |GRANTOPTION |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
@@ -536,8 +520,6 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
-SYSREQUIREDPERM |0     
-SYSREQUIREDPERM |1     
 SYSROUTINEPERMS |0     
 SYSROUTINEPERMS |1     
 SYSROUTINEPERMS |1     
@@ -650,7 +632,6 @@
 SYSFILES |1          
 SYSFOREIGNKEYS |1          
 SYSKEYS |1          
-SYSREQUIREDPERM |1          
 SYSROUTINEPERMS |1          
 SYSSCHEMAS |1          
 SYSSTATEMENTS |1          
@@ -733,7 +714,6 @@
 SYSFILES |1          
 SYSFOREIGNKEYS |1          
 SYSKEYS |1          
-SYSREQUIREDPERM |1          
 SYSROUTINEPERMS |1          
 SYSSCHEMAS |1          
 SYSSTATEMENTS |1          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out Wed Aug  2 12:48:59 2006
@@ -2509,7 +2509,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -2531,7 +2530,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out Wed Aug  2 12:48:59 2006
@@ -655,7 +655,6 @@
 SYSTABLEPERMS                                                                                                                   |1          
 SYSCOLPERMS                                                                                                                     |1          
 SYSROUTINEPERMS                                                                                                                 |1          
-SYSREQUIREDPERM                                                                                                                 |1          
 ij> -- verify the consistency of the indexes on the user tables
 select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', tablename)
 from sys.systables where tabletype = 'T';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out Wed Aug  2 12:48:59 2006
@@ -1052,7 +1052,6 @@
 SYS                                                                                                                             |SYSFILES                                                                                                                        |1          
 SYS                                                                                                                             |SYSFOREIGNKEYS                                                                                                                  |1          
 SYS                                                                                                                             |SYSKEYS                                                                                                                         |1          
-SYS                                                                                                                             |SYSREQUIREDPERM                                                                                                                 |1          
 SYS                                                                                                                             |SYSROUTINEPERMS                                                                                                                 |1          
 SYS                                                                                                                             |SYSSCHEMAS                                                                                                                      |1          
 SYS                                                                                                                             |SYSSTATEMENTS                                                                                                                   |1          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out Wed Aug  2 12:48:59 2006
@@ -385,7 +385,6 @@
 	{,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null}
 	{,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null}
 	{,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null}
-	{,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null}
 	{,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null}
 	{,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null}
 	{,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Wed Aug  2 12:48:59 2006
@@ -329,7 +329,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -351,7 +350,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Wed Aug  2 12:48:59 2006
@@ -359,7 +359,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null
@@ -381,7 +380,6 @@
 ,SYS,SYSFILES,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSKEYS,SYSTEM TABLE,,null,null,null,null,null
-,SYS,SYSREQUIREDPERM,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSROUTINEPERMS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,,null,null,null,null,null
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,,null,null,null,null,null

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out?rev=428115&r1=428114&r2=428115&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out Wed Aug  2 12:48:59 2006
@@ -178,7 +178,6 @@
 SYSTABLEPERMS                                                                                                                   |1          
 SYSCOLPERMS                                                                                                                     |1          
 SYSROUTINEPERMS                                                                                                                 |1          
-SYSREQUIREDPERM                                                                                                                 |1          
 ij> -- drop tables
 drop table pos1;
 0 rows inserted/updated/deleted
@@ -207,7 +206,6 @@
 SYSTABLEPERMS                                                                                                                   |1          
 SYSCOLPERMS                                                                                                                     |1          
 SYSROUTINEPERMS                                                                                                                 |1          
-SYSREQUIREDPERM                                                                                                                 |1          
 ij> -- test that a unique key can be explicitly not nullable
 create table pos1(c1 int not null unique);
 0 rows inserted/updated/deleted



Mime
View raw message