db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From banda...@apache.org
Subject svn commit: r356133 [5/6] - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/db/ engine/org/apache/derby/iapi/reference/ engine/org/apache/derby/iapi/sql/compile/ engine/org/apache/derby/iapi/sql/conn/ engine/org/apache/derby/iapi/sql/diction...
Date Mon, 12 Dec 2005 03:58:19 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out?rev=356133&r1=356132&r2=356133&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 Sun Dec 11 19:57:33 2005
@@ -51,6 +51,7 @@
 -----
 SYSALIASES |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSCHECKS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
+SYSCOLPERMS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSCOLUMNS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSCONGLOMERATES |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSCONSTRAINTS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
@@ -59,9 +60,12 @@
 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 }                                                                                                                                                                                                                                                                                                                                          
 SYSSTATISTICS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
+SYSTABLEPERMS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSTABLES |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSTRIGGERS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
 SYSVIEWS |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=12, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=false }                                                                                                                                                                                                                                                                                                                                          
@@ -76,6 +80,7 @@
 SYSALIASES_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSALIASES_INDEX3 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSCHECKS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
+SYSCOLPERMS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSCOLUMNS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSCOLUMNS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSCONGLOMERATES_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
@@ -91,11 +96,14 @@
 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 }                                                                                                                                                                                                                                                                                                                                            
 SYSSCHEMAS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSSCHEMAS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSSTATEMENTS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSSTATEMENTS_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSSTATISTICS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
+SYSTABLEPERMS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSTABLES_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSTABLES_INDEX2 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
 SYSTRIGGERS_INDEX1 |{ derby.storage.initialPages=1, derby.storage.minimumRecordSize=1, derby.storage.pageReservedSpace=0, derby.storage.pageSize=4096, derby.storage.reusableRecordId=true }                                                                                                                                                                                                                                                                                                                                            
@@ -121,6 +129,10 @@
 SYSTRIGGERS |S
 SYSSTATISTICS |S
 SYSDUMMY1 |S
+SYSTABLEPERMS |S
+SYSCOLPERMS |S
+SYSROUTINEPERMS |S
+SYSREQUIREDPERM |S
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
 	columndatatype
@@ -141,6 +153,11 @@
 SYSCHECKS |CHECKDEFINITION |2 |LONG VARCHAR NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSCHECKS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSCHECKS |REFERENCEDCOLUMNS |3 |org.apache.derby.catalog.ReferencedColumns NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
+SYSCOLPERMS |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
+SYSCOLPERMS |GRANTEE |1 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSCOLPERMS |GRANTOR |2 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSCOLPERMS |TABLEID |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+SYSCOLPERMS |TYPE |4 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSCOLUMNS |AUTOINCREMENTINC |9 |BIGINT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
 SYSCOLUMNS |AUTOINCREMENTSTART |8 |BIGINT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
 SYSCOLUMNS |AUTOINCREMENTVALUE |7 |BIGINT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
@@ -181,6 +198,15 @@
 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 |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+SYSROUTINEPERMS |GRANTEE |1 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSROUTINEPERMS |GRANTOPTION |4 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSROUTINEPERMS |GRANTOR |2 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
 SYSSCHEMAS |AUTHORIZATIONID |3 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSSCHEMAS |SCHEMAID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSSCHEMAS |SCHEMANAME |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
@@ -201,6 +227,15 @@
 SYSSTATISTICS |TABLEID |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSSTATISTICS |TYPE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSSTATISTICS |VALID |6 |BOOLEAN NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |DELETEPRIV |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |GRANTEE |1 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSTABLEPERMS |GRANTOR |2 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSTABLEPERMS |INSERTPRIV |6 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |REFERENCESPRIV |8 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |SELECTPRIV |4 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |TABLEID |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+SYSTABLEPERMS |TRIGGERPRIV |9 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |UPDATEPRIV |7 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSTABLES |LOCKGRANULARITY |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSTABLES |SCHEMAID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSTABLES |TABLEID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
@@ -239,6 +274,8 @@
 SYSALIASES |1     
 SYSCHECKS |0     
 SYSCHECKS |1     
+SYSCOLPERMS |0     
+SYSCOLPERMS |1     
 SYSCOLUMNS |0     
 SYSCOLUMNS |1     
 SYSCOLUMNS |1     
@@ -262,6 +299,10 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
+SYSREQUIREDPERM |0     
+SYSREQUIREDPERM |1     
+SYSROUTINEPERMS |0     
+SYSROUTINEPERMS |1     
 SYSSCHEMAS |0     
 SYSSCHEMAS |1     
 SYSSCHEMAS |1     
@@ -270,6 +311,8 @@
 SYSSTATEMENTS |1     
 SYSSTATISTICS |0     
 SYSSTATISTICS |1     
+SYSTABLEPERMS |0     
+SYSTABLEPERMS |1     
 SYSTABLES |0     
 SYSTABLES |1     
 SYSTABLES |1     
@@ -300,6 +343,10 @@
 SYSTRIGGERS |S
 SYSSTATISTICS |S
 SYSDUMMY1 |S
+SYSTABLEPERMS |S
+SYSCOLPERMS |S
+SYSROUTINEPERMS |S
+SYSREQUIREDPERM |S
 T |T
 ij> select TABLENAME,
 	COLUMNNAME, COLUMNNUMBER,
@@ -321,6 +368,11 @@
 SYSCHECKS |CHECKDEFINITION |2 |LONG VARCHAR NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSCHECKS |CONSTRAINTID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSCHECKS |REFERENCEDCOLUMNS |3 |org.apache.derby.catalog.ReferencedColumns NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
+SYSCOLPERMS |COLUMNS |5 |org.apache.derby.iapi.services.io.FormatableBitSet NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                         
+SYSCOLPERMS |GRANTEE |1 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSCOLPERMS |GRANTOR |2 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSCOLPERMS |TABLEID |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+SYSCOLPERMS |TYPE |4 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSCOLUMNS |AUTOINCREMENTINC |9 |BIGINT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
 SYSCOLUMNS |AUTOINCREMENTSTART |8 |BIGINT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
 SYSCOLUMNS |AUTOINCREMENTVALUE |7 |BIGINT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
@@ -361,6 +413,15 @@
 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 |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+SYSROUTINEPERMS |GRANTEE |1 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSROUTINEPERMS |GRANTOPTION |4 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSROUTINEPERMS |GRANTOR |2 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
 SYSSCHEMAS |AUTHORIZATIONID |3 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 SYSSCHEMAS |SCHEMAID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSSCHEMAS |SCHEMANAME |2 |VARCHAR(128) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
@@ -381,6 +442,15 @@
 SYSSTATISTICS |TABLEID |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSSTATISTICS |TYPE |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSSTATISTICS |VALID |6 |BOOLEAN NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |DELETEPRIV |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |GRANTEE |1 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSTABLEPERMS |GRANTOR |2 |VARCHAR(30) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+SYSTABLEPERMS |INSERTPRIV |6 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |REFERENCESPRIV |8 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |SELECTPRIV |4 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |TABLEID |3 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+SYSTABLEPERMS |TRIGGERPRIV |9 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+SYSTABLEPERMS |UPDATEPRIV |7 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSTABLES |LOCKGRANULARITY |5 |CHAR(1) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 SYSTABLES |SCHEMAID |4 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
 SYSTABLES |TABLEID |1 |CHAR(36) NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
@@ -421,6 +491,8 @@
 SYSALIASES |1     
 SYSCHECKS |0     
 SYSCHECKS |1     
+SYSCOLPERMS |0     
+SYSCOLPERMS |1     
 SYSCOLUMNS |0     
 SYSCOLUMNS |1     
 SYSCOLUMNS |1     
@@ -444,6 +516,10 @@
 SYSFOREIGNKEYS |1     
 SYSKEYS |0     
 SYSKEYS |1     
+SYSREQUIREDPERM |0     
+SYSREQUIREDPERM |1     
+SYSROUTINEPERMS |0     
+SYSROUTINEPERMS |1     
 SYSSCHEMAS |0     
 SYSSCHEMAS |1     
 SYSSCHEMAS |1     
@@ -452,6 +528,8 @@
 SYSSTATEMENTS |1     
 SYSSTATISTICS |0     
 SYSSTATISTICS |1     
+SYSTABLEPERMS |0     
+SYSTABLEPERMS |1     
 SYSTABLES |0     
 SYSTABLES |1     
 SYSTABLES |1     
@@ -553,6 +631,10 @@
 SYSFILES |1          
 SYSTRIGGERS |1          
 SYSSTATISTICS |1          
+SYSTABLEPERMS |1          
+SYSCOLPERMS |1          
+SYSROUTINEPERMS |1          
+SYSREQUIREDPERM |1          
 ij> -- drop views
 drop view dummyview;
 0 rows inserted/updated/deleted
@@ -632,4 +714,8 @@
 SYSFILES |1          
 SYSTRIGGERS |1          
 SYSSTATISTICS |1          
+SYSTABLEPERMS |1          
+SYSCOLPERMS |1          
+SYSROUTINEPERMS |1          
+SYSREQUIREDPERM |1          
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out?rev=356133&r1=356132&r2=356133&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 Sun Dec 11 19:57:33 2005
@@ -652,6 +652,10 @@
 SYSFILES                                                                                                                        |1          
 SYSTRIGGERS                                                                                                                     |1          
 SYSSTATISTICS                                                                                                                   |1          
+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/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out?rev=356133&r1=356132&r2=356133&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 Sun Dec 11 19:57:33 2005
@@ -1044,6 +1044,7 @@
 APP                                                                                                                             |XENA                                                                                                                            |1          
 SYS                                                                                                                             |SYSALIASES                                                                                                                      |1          
 SYS                                                                                                                             |SYSCHECKS                                                                                                                       |1          
+SYS                                                                                                                             |SYSCOLPERMS                                                                                                                     |1          
 SYS                                                                                                                             |SYSCOLUMNS                                                                                                                      |1          
 SYS                                                                                                                             |SYSCONGLOMERATES                                                                                                                |1          
 SYS                                                                                                                             |SYSCONSTRAINTS                                                                                                                  |1          
@@ -1051,9 +1052,12 @@
 SYS                                                                                                                             |SYSFILES                                                                                                                        |1          
 SYS                                                                                                                             |SYSFOREIGNKEYS                                                                                                                  |1          
 SYS                                                                                                                             |SYSKEYS                                                                                                                         |1          
+SYS                                                                                                                             |SYSREQUIREDPERM                                                                                                                 |1          
+SYS                                                                                                                             |SYSROUTINEPERMS                                                                                                                 |1          
 SYS                                                                                                                             |SYSSCHEMAS                                                                                                                      |1          
 SYS                                                                                                                             |SYSSTATEMENTS                                                                                                                   |1          
 SYS                                                                                                                             |SYSSTATISTICS                                                                                                                   |1          
+SYS                                                                                                                             |SYSTABLEPERMS                                                                                                                   |1          
 SYS                                                                                                                             |SYSTABLES                                                                                                                       |1          
 SYS                                                                                                                             |SYSTRIGGERS                                                                                                                     |1          
 SYS                                                                                                                             |SYSVIEWS                                                                                                                        |1          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out?rev=356133&r1=356132&r2=356133&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 Sun Dec 11 19:57:33 2005
@@ -377,6 +377,7 @@
 	 --------- ----------- ---------- ---------- -------
 	{,SYS,SYSALIASES,SYSTEM TABLE,}
 	{,SYS,SYSCHECKS,SYSTEM TABLE,}
+	{,SYS,SYSCOLPERMS,SYSTEM TABLE,}
 	{,SYS,SYSCOLUMNS,SYSTEM TABLE,}
 	{,SYS,SYSCONGLOMERATES,SYSTEM TABLE,}
 	{,SYS,SYSCONSTRAINTS,SYSTEM TABLE,}
@@ -384,9 +385,12 @@
 	{,SYS,SYSFILES,SYSTEM TABLE,}
 	{,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,}
 	{,SYS,SYSKEYS,SYSTEM TABLE,}
+	{,SYS,SYSREQUIREDPERM,SYSTEM TABLE,}
+	{,SYS,SYSROUTINEPERMS,SYSTEM TABLE,}
 	{,SYS,SYSSCHEMAS,SYSTEM TABLE,}
 	{,SYS,SYSSTATEMENTS,SYSTEM TABLE,}
 	{,SYS,SYSSTATISTICS,SYSTEM TABLE,}
+	{,SYS,SYSTABLEPERMS,SYSTEM TABLE,}
 	{,SYS,SYSTABLES,SYSTEM TABLE,}
 	{,SYS,SYSTRIGGERS,SYSTEM TABLE,}
 	{,SYS,SYSVIEWS,SYSTEM TABLE,}

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out?rev=356133&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out Sun Dec 11 19:57:33 2005
@@ -0,0 +1,119 @@
+ij> connect 'grantRevoke;create=true' user 'satheesh' as satConnection;
+ij> -- Test table privileges
+create table satheesh.tsat(i int, j int);
+0 rows inserted/updated/deleted
+ij> grant select on satheesh.tsat to public;
+0 rows inserted/updated/deleted
+ij> grant insert on satheesh.tsat to foo;
+0 rows inserted/updated/deleted
+ij> grant delete on satheesh.tsat to foo;
+0 rows inserted/updated/deleted
+ij> grant update on satheesh.tsat to foo;
+0 rows inserted/updated/deleted
+ij> grant update(i) on satheesh.tsat to bar;
+0 rows inserted/updated/deleted
+ij> select * from sys.systableperms;
+GRANTEE                       |GRANTOR                       |TABLEID                             |&|&|&|&|&|&
+--------------------------------------------------------------------------------------------------------------
+PUBLIC                        |SATHEESH                      |xxxxFILTERED-UUIDxxxx|y|N|N|N|N|N
+foo                           |SATHEESH                      |xxxxFILTERED-UUIDxxxx|N|y|y|y|N|N
+2 rows selected
+ij> connect 'grantRevoke' user 'bar' as barConnection;
+ij(BARCONNECTION)> -- Following revokes should fail. Only owner can revoke permissions
+revoke select on satheesh.tsat from public;
+ERROR 2850C: User 'BAR' is not the owner of Table/View 'SATHEESH'.'TSAT'.
+ij(BARCONNECTION)> revoke insert on satheesh.tsat from foo;
+ERROR 2850C: User 'BAR' is not the owner of Table/View 'SATHEESH'.'TSAT'.
+ij(BARCONNECTION)> revoke update(i) on satheesh.tsat from foo;
+ERROR 2850C: User 'BAR' is not the owner of Table/View 'SATHEESH'.'TSAT'.
+ij(BARCONNECTION)> revoke update on satheesh.tsat from foo;
+ERROR 2850C: User 'BAR' is not the owner of Table/View 'SATHEESH'.'TSAT'.
+ij(BARCONNECTION)> revoke delete on satheesh.tsat from foo;
+ERROR 2850C: User 'BAR' is not the owner of Table/View 'SATHEESH'.'TSAT'.
+ij(BARCONNECTION)> set connection satConnection;
+ij(SATCONNECTION)> -- Revoke permissions not granted already
+revoke trigger on satheesh.tsat from foo;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> revoke references on satheesh.tsat from foo;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> -- Following revokes should revoke permissions
+revoke update on satheesh.tsat from foo;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> revoke delete on satheesh.tsat from foo;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> -- Check success by looking at systableperms directly for now
+select * from sys.systableperms;
+GRANTEE                       |GRANTOR                       |TABLEID                             |&|&|&|&|&|&
+--------------------------------------------------------------------------------------------------------------
+PUBLIC                        |SATHEESH                      |xxxxFILTERED-UUIDxxxx|y|N|N|N|N|N
+foo                           |SATHEESH                      |xxxxFILTERED-UUIDxxxx|N|N|y|N|N|N
+2 rows selected
+ij(SATCONNECTION)> revoke insert on satheesh.tsat from foo;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> revoke select on satheesh.tsat from public;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> -- Check success by looking at systableperms directly for now
+select * from sys.systableperms;
+GRANTEE                       |GRANTOR                       |TABLEID                             |&|&|&|&|&|&
+--------------------------------------------------------------------------------------------------------------
+0 rows selected
+ij(SATCONNECTION)> -- Test routine permissions
+CREATE FUNCTION F_ABS(P1 INT)
+RETURNS INT
+NO SQL
+RETURNS NULL ON NULL INPUT
+EXTERNAL NAME 'java.lang.Math.abs'
+LANGUAGE JAVA PARAMETER STYLE JAVA;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> grant execute on function F_ABS to foo;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> grant execute on function F_ABS(int) to bar;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> revoke execute on function F_ABS(int) from bar RESTRICT;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> drop function f_abs;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> -- Tests with views
+create view v1 as select * from tsat;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> grant select on v1 to bar;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> grant insert on v1 to foo;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> grant update on v1 to public;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> -- Tests for synonym. Not supported currently.
+create synonym mySym for satheesh.tsat;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> -- Expected to fail
+grant select on mySym to bar;
+ERROR 42X05: Table 'MYSYM' does not exist.
+ij(SATCONNECTION)> grant insert on mySym to foo;
+ERROR 42X05: Table 'MYSYM' does not exist.
+ij(SATCONNECTION)> -- Test for external security clause
+-- Expected to fail
+CREATE FUNCTION F_ABS(P1 INT)
+RETURNS INT NO SQL
+RETURNS NULL ON NULL INPUT
+EXTERNAL NAME 'java.lang.Math.abs'
+EXTERNAL SECURITY DEFINOR
+LANGUAGE JAVA PARAMETER STYLE JAVA;
+ERROR 42X01: Syntax error: Encountered "DEFINOR" at line 7, column 19.
+ij(SATCONNECTION)> CREATE PROCEDURE AUTH_TEST.addUserUtility(IN userName VARCHAR(50), IN permission VARCHAR(22)) 
+LANGUAGE JAVA PARAMETER STYLE JAVA
+EXTERNAL SECURITY INVOKER
+EXTERNAL NAME 'org.apache.derby.database.UserUtility.add';
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> CREATE FUNCTION F_ABS(P1 INT)
+RETURNS INT NO SQL
+RETURNS NULL ON NULL INPUT
+EXTERNAL NAME 'java.lang.Math.abs'
+EXTERNAL SECURITY DEFINER
+LANGUAGE JAVA PARAMETER STYLE JAVA;
+0 rows inserted/updated/deleted
+ij(SATCONNECTION)> values f_abs(-5);
+1          
+-----------
+5          
+1 row selected
+ij(SATCONNECTION)> 

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=356133&r1=356132&r2=356133&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 Sun Dec 11 19:57:33 2005
@@ -177,6 +177,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -184,9 +185,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,
@@ -195,6 +199,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -202,9 +207,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=356133&r1=356132&r2=356133&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 Sun Dec 11 19:57:33 2005
@@ -207,6 +207,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -214,9 +215,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,
@@ -225,6 +229,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -232,9 +237,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out?rev=356133&r1=356132&r2=356133&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 Sun Dec 11 19:57:33 2005
@@ -175,6 +175,10 @@
 SYSFILES                                                                                                                        |1          
 SYSTRIGGERS                                                                                                                     |1          
 SYSSTATISTICS                                                                                                                   |1          
+SYSTABLEPERMS                                                                                                                   |1          
+SYSCOLPERMS                                                                                                                     |1          
+SYSROUTINEPERMS                                                                                                                 |1          
+SYSREQUIREDPERM                                                                                                                 |1          
 ij> -- drop tables
 drop table pos1;
 0 rows inserted/updated/deleted
@@ -200,6 +204,10 @@
 SYSFILES                                                                                                                        |1          
 SYSTRIGGERS                                                                                                                     |1          
 SYSSTATISTICS                                                                                                                   |1          
+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