Return-Path: 
 <commits-return-81526-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-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 1425110A25
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Fri, 20 Sep 2013 14:52:52 +0000 (UTC)
Received: (qmail 41870 invoked by uid 500); 20 Sep 2013 14:52:51 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 41817 invoked by uid 500); 20 Sep 2013 14:52:51 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 41800 invoked by uid 99); 20 Sep 2013 14:52:51 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Sep 2013 14:52:51 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 7FD548A3EAA; Fri, 20 Sep 2013 14:52:51 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dbrosius@apache.org
To: commits@cassandra.apache.org
Date: Fri, 20 Sep 2013 14:52:52 -0000
Message-Id: <0d3e3ccf563b40c798e76dae2683542d@git.apache.org>
In-Reply-To: <cd089c1987ee479896313c002acb2531@git.apache.org>
References: <cd089c1987ee479896313c002acb2531@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcb4da73
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcb4da73
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcb4da73

Branch: refs/heads/cassandra-2.0
Commit: bcb4da739cc6a0fdb83f49772dc0de1659bc8ced
Parents: eb96db6 a0fa697
Author: Dave Brosius <dbrosius@apache.org>
Authored: Fri Sep 20 10:49:10 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Fri Sep 20 10:49:10 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/Cql.g | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcb4da73/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index 6fb0db4,7101c71..17afb00
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -869,10 -789,9 +869,11 @@@ relation[List<Relation> clauses
              for (ColumnIdentifier id : l)
                  $clauses.add(new Relation(id, type, t, true));
          }
 +    | name=cident K_IN { Term.Raw marker = null; } (QMARK { marker = newINBindVariables(null); } | ':' mid=cident { marker = newINBindVariables(mid); })
 +        { $clauses.add(new Relation(name, Relation.Type.IN, marker)); }
      | name=cident K_IN { Relation rel = Relation.createInRelation($name.id); }
         '(' ( f1=term { rel.addInValue(f1); } (',' fN=term { rel.addInValue(fN); } )* )? ')' { $clauses.add(rel); }
+     | '(' relation[$clauses] ')'
      ;
  
  comparatorType returns [CQL3Type t]