You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2014/10/17 23:38:16 UTC
svn commit: r1632674 - in /db/derby/code/branches/10.11: ./
java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
Author: myrnavl
Date: Fri Oct 17 21:38:16 2014
New Revision: 1632674
URL: http://svn.apache.org/r1632674
Log:
DERBY-6628; Intermittent error in TriggerGeneralTest
merge of revision 1621223 from trunk
Modified:
db/derby/code/branches/10.11/ (props changed)
db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1621215
Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java?rev=1632674&r1=1632673&r2=1632674&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java (original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java Fri Oct 17 21:38:16 2014
@@ -858,8 +858,11 @@ public final class TriggerGeneralTest ex
assertUpdateCount(st, 1,
"delete from t1 where a = 3");
- rs = st.executeQuery("select type, mode, tablename from "
- + "syscs_diag.lock_table order by tablename, type");
+ rs = st.executeQuery("select type, mode, tablename from " +
+ "syscs_diag.lock_table " +
+ "where tablename not like 'SYS%'" + // DERBY-6628: filter
+ // any such compilation lock
+ "order by tablename, type");
expColNames = new String [] {"TYPE", "MODE", "TABLENAME"};
JDBC.assertColumnNames(rs, expColNames);