Updated Branches: refs/heads/cassandra-1.2 225cb0e7f -> 83ed1cbda
Allow empty blob literals in CQL3 patch by slebresne; reviewed by iamaleksey for CASSANDRA-5452 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83ed1cbd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83ed1cbd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83ed1cbd Branch: refs/heads/cassandra-1.2 Commit: 83ed1cbda98bec659fdf8ffb7e19789c04e36763 Parents: 225cb0e Author: Sylvain Lebresne <[email protected]> Authored: Thu Apr 11 10:48:35 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Apr 11 10:49:50 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ed1cbd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 66279f0..5c26014 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,7 @@ * Include fatal errors in trace events (CASSANDRA-5447) * Ensure that PerRowSecondaryIndex is notified of row-level deletes (CASSANDRA-5445) + * Allow empty blob literals in CQL3 (CASSANDRA-5452) Merged from 1.1: * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ed1cbd/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g index 0c2113f..a91e529 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -1052,7 +1052,7 @@ IDENT ; HEXNUMBER - : '0' X HEX+ + : '0' X HEX* ; UUID
