Return-Path: 
 <derby-commits-return-17530-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 27CFA1075B
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Wed, 18 Sep 2013 14:44:42 +0000 (UTC)
Received: (qmail 65875 invoked by uid 500); 18 Sep 2013 14:44:31 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 65745 invoked by uid 500); 18 Sep 2013 14:44:21 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 65728 invoked by uid 99); 18 Sep 2013 14:44:21 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Sep 2013 14:44:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Sep 2013 14:44:17 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D1FD023889E1;
	Wed, 18 Sep 2013 14:43:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1524432 -
 /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
Date: Wed, 18 Sep 2013 14:43:56 -0000
To: derby-commits@db.apache.org
From: rhillegas@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130918144356.D1FD023889E1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rhillegas
Date: Wed Sep 18 14:43:56 2013
New Revision: 1524432

URL: http://svn.apache.org/r1524432
Log:
DERBY-3155: Remove spurious comma from grammar production for multiple WHEN [NOT] MATCHED clauses in MERGE statement; tests ran cleanly on derby-3155-02-ag-fixParserWarning.diff.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=1524432&r1=1524431&r2=1524432&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Wed Sep 18 14:43:56 2013
@@ -3656,7 +3656,7 @@ matchingClauseList() throws StandardExce
     ArrayList<MatchingClauseNode>   matchingClauses = new ArrayList<MatchingClauseNode>();
 }
 {
-    matchingClause( matchingClauses ) ( <COMMA> matchingClause( matchingClauses ) ) *
+    matchingClause( matchingClauses ) ( matchingClause( matchingClauses ) ) *
 	{
         return matchingClauses;
 	}