db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r783088 [2/3] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/updatelocks.out suites/storemats.runall
Date Tue, 09 Jun 2009 18:18:29 GMT

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out?rev=783088&r1=783087&r2=783088&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out Tue Jun  9 18:18:28 2009
@@ -16,7 +16,23 @@
 --
 -- Very basic single user testing of update row locking.
 run resource 'createTestProcedures.subsql';
-ij> CREATE FUNCTION  PADSTRING (DATA VARCHAR(32000), LENGTH INTEGER) RETURNS VARCHAR(32000) EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.Formatters.padString' LANGUAGE JAVA PARAMETER STYLE JAVA;
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+CREATE FUNCTION  PADSTRING (DATA VARCHAR(32000), LENGTH INTEGER) RETURNS VARCHAR(32000) EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.Formatters.padString' LANGUAGE JAVA PARAMETER STYLE JAVA;
 0 rows inserted/updated/deleted
 ij> CREATE PROCEDURE WAIT_FOR_POST_COMMIT() DYNAMIC RESULT SETS 0 LANGUAGE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.T_Access.waitForPostCommitToFinish' PARAMETER STYLE JAVA;
 0 rows inserted/updated/deleted
@@ -24,7 +40,23 @@
 0 rows inserted/updated/deleted
 ij> autocommit off;
 ij> run resource 'LockTableQuery.subsql';
-ij> create view lock_table as
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+create view lock_table as
 select 
     cast(username as char(8)) as username,
     cast(t.type as char(8)) as trantype,
@@ -111,7 +143,23 @@
 1 row inserted/updated/deleted
 ij> commit;
 ij> run resource 'updatecursorlocks.subsql';
-ij> -- Very basic single user testing of update locks on cursors on heap tables.  
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks on cursors on heap tables.  
 -- This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
@@ -789,7 +837,23 @@
 1 row inserted/updated/deleted
 ij> commit;
 ij> run resource 'updatesetlocks.subsql';
-ij> -- Very basic single user testing of heap set query update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of heap set query update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -1126,7 +1190,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeCursorLocks.subsql';
-ij> -- Very basic single user testing of btree cursor update locks.  This ".subsql"
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of btree cursor update locks.  This ".subsql"
 -- test is meant to be run from another test such that it gets run under 
 -- multiple isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -1537,7 +1617,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -1546,7 +1625,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -1593,7 +1671,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -1786,7 +1863,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -1795,7 +1871,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -1890,7 +1965,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -1901,7 +1975,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -1944,7 +2017,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -1957,7 +2029,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |4   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,11)    |GRANT|ACTIVE  
@@ -2011,7 +2082,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeCursorLocks.subsql';
-ij> -- Very basic single user testing of btree cursor update locks.  This ".subsql"
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of btree cursor update locks.  This ".subsql"
 -- test is meant to be run from another test such that it gets run under 
 -- multiple isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -2422,7 +2509,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -2476,7 +2562,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -2669,7 +2754,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -2771,7 +2855,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -2782,7 +2865,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -2825,7 +2907,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -2838,7 +2919,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |4   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,11)    |GRANT|ACTIVE  
@@ -2892,7 +2972,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeSetLocks.subsql';
-ij> -- Very basic single user testing of update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -2992,8 +3088,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,10)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,11)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,12)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,8)     |GRANT|ACTIVE  
 ij> commit;
@@ -3209,11 +3303,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,10)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,11)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,12)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,8)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,13)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> commit;
@@ -3314,7 +3403,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeSetLocks.subsql';
-ij> -- Very basic single user testing of update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -3414,8 +3519,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,10)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,11)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,12)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,8)     |GRANT|ACTIVE  
 ij> commit;
@@ -3631,11 +3734,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,10)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,11)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,12)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,8)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,13)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> commit;
@@ -3733,7 +3831,23 @@
 1 row inserted/updated/deleted
 ij> commit;
 ij> run resource 'updatecursorlocks.subsql';
-ij> -- Very basic single user testing of update locks on cursors on heap tables.  
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks on cursors on heap tables.  
 -- This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
@@ -4407,7 +4521,23 @@
 1 row inserted/updated/deleted
 ij> commit;
 ij> run resource 'updatesetlocks.subsql';
-ij> -- Very basic single user testing of heap set query update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of heap set query update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -4740,7 +4870,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeCursorLocks.subsql';
-ij> -- Very basic single user testing of btree cursor update locks.  This ".subsql"
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of btree cursor update locks.  This ".subsql"
 -- test is meant to be run from another test such that it gets run under 
 -- multiple isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -4792,7 +4938,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4802,7 +4947,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4812,7 +4956,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4822,7 +4965,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(4,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4832,7 +4974,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4842,7 +4983,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(6,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4852,7 +4992,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
@@ -4887,7 +5026,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4897,7 +5035,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4907,7 +5044,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4917,7 +5053,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(4,6)     |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
@@ -4946,7 +5081,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -4956,7 +5090,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 ij> delete from a where current of scan_cursor;
 1 row inserted/updated/deleted
@@ -4964,7 +5097,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -4975,7 +5107,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -4988,7 +5119,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |5   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(4,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5000,7 +5130,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |5   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5014,7 +5143,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |7   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(6,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5027,7 +5155,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |7   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5093,7 +5220,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5103,7 +5229,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5113,7 +5238,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5123,7 +5247,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
@@ -5174,7 +5297,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -5228,7 +5350,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -5274,7 +5395,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5286,7 +5406,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -5299,7 +5418,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
@@ -5311,7 +5429,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
@@ -5366,7 +5483,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          
@@ -5376,7 +5492,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
@@ -5427,7 +5542,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -5529,7 +5643,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -5540,7 +5653,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -5583,7 +5695,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -5596,7 +5707,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |4   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(5,6)     |GRANT|ACTIVE  
@@ -5646,7 +5756,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeCursorLocks.subsql';
-ij> -- Very basic single user testing of btree cursor update locks.  This ".subsql"
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of btree cursor update locks.  This ".subsql"
 -- test is meant to be run from another test such that it gets run under 
 -- multiple isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -5698,7 +5824,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5708,7 +5833,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5718,7 +5842,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5728,7 +5851,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(4,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5738,7 +5860,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5748,7 +5869,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(6,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5758,7 +5878,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
@@ -5793,7 +5912,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5803,7 +5921,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5813,7 +5930,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5823,7 +5939,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(4,6)     |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
@@ -5852,7 +5967,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -5862,7 +5976,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 ij> delete from a where current of scan_cursor;
 1 row inserted/updated/deleted
@@ -5870,7 +5983,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -5881,7 +5993,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -5894,7 +6005,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |5   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(4,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5906,7 +6016,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |5   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5920,7 +6029,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |7   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(6,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5933,7 +6041,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |7   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(4,6)     |GRANT|ACTIVE  
@@ -5999,7 +6106,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -6009,7 +6115,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -6019,7 +6124,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -6029,7 +6133,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
@@ -6080,7 +6183,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -6134,7 +6236,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -6180,7 +6281,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          |C                                                                                                                               
@@ -6192,7 +6292,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -6205,7 +6304,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
@@ -6217,7 +6315,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(7,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
@@ -6272,7 +6369,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          
@@ -6282,7 +6378,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
@@ -6333,7 +6428,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -6435,7 +6529,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -6446,7 +6539,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -6489,7 +6581,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -6502,7 +6593,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |4   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(5,6)     |GRANT|ACTIVE  
@@ -6552,7 +6642,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeSetLocks.subsql';
-ij> -- Very basic single user testing of update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -6651,9 +6757,7 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(4,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(6,6)     |GRANT|ACTIVE  
 ij> commit;
@@ -6876,11 +6980,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(2,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(4,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(6,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(7,6)     |GRANT|ACTIVE  
 ij> commit;
@@ -6977,7 +7076,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeSetLocks.subsql';
-ij> -- Very basic single user testing of update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -7076,9 +7191,7 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(4,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(2,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(6,6)     |GRANT|ACTIVE  
 ij> commit;
@@ -7301,11 +7414,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(2,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(4,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(6,6)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(7,6)     |GRANT|ACTIVE  
 ij> commit;
@@ -7412,7 +7520,23 @@
 1 row inserted/updated/deleted
 ij> commit;
 ij> run resource 'updatecursorlocks.subsql';
-ij> -- Very basic single user testing of update locks on cursors on heap tables.  
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks on cursors on heap tables.  
 -- This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
@@ -8204,7 +8328,23 @@
 1 row inserted/updated/deleted
 ij> commit;
 ij> run resource 'updatesetlocks.subsql';
-ij> -- Very basic single user testing of heap set query update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of heap set query update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -8313,6 +8453,8 @@
 APP     |UserTran|ROW     |1   |U   |A           |(1,10)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,12)    |GRANT|ACTIVE  
+APP     |UserTran|ROW     |1   |U   |A           |(1,13)    |GRANT|ACTIVE  
+APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,8)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,10)    |GRANT|ACTIVE  
@@ -8396,6 +8538,8 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
+APP     |UserTran|ROW     |1   |U   |A           |(1,13)    |GRANT|ACTIVE  
+APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
@@ -8554,7 +8698,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeCursorLocks.subsql';
-ij> -- Very basic single user testing of btree cursor update locks.  This ".subsql"
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of btree cursor update locks.  This ".subsql"
 -- test is meant to be run from another test such that it gets run under 
 -- multiple isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -9060,7 +9220,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -9069,7 +9228,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -9117,7 +9275,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -9330,7 +9487,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -9339,7 +9495,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -9437,7 +9592,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -9448,7 +9602,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
@@ -9494,7 +9647,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -9507,7 +9659,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |4   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
@@ -9564,7 +9715,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeCursorLocks.subsql';
-ij> -- Very basic single user testing of btree cursor update locks.  This ".subsql"
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of btree cursor update locks.  This ".subsql"
 -- test is meant to be run from another test such that it gets run under 
 -- multiple isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -10070,7 +10237,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -10126,7 +10292,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> close scan_cursor;
@@ -10339,7 +10504,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -10445,7 +10609,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -10456,7 +10619,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
@@ -10502,7 +10664,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 ij> next scan_cursor;
@@ -10515,7 +10676,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |4   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,11)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
@@ -10572,7 +10732,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeSetLocks.subsql';
-ij> -- Very basic single user testing of update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- Very basic single user testing of update locks.  This ".subsql" test is
 -- meant to be run from another test such that it gets run under multiple
 -- isolation levels.  This is important for update locks as they behave
 -- differently, depending on isolation levels.
@@ -10680,8 +10856,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |A           |(1,10)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,11)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,12)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,8)     |GRANT|ACTIVE  
 ij> commit;
@@ -10897,11 +11071,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,10)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,11)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,12)    |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,8)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,9)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,13)    |GRANT|ACTIVE  
 APP     |UserTran|ROW     |2   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> commit;
@@ -11002,7 +11171,23 @@
 0 rows inserted/updated/deleted
 ij> commit;
 ij> run resource 'updateBtreeSetLocks.subsql';
-ij> -- Very basic single user testing of update locks.  This ".subsql" test is
+ij> --
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with

[... 2984 lines stripped ...]


Mime
View raw message