Merge branch 'cassandra-2.2' into cassandra-3.0

2015-10-27 09:12:22 -05:00 · 2015-10-27 09:12:22 -05:00 · d856d3d7bb
parent f901a74c88 40cef770d0
commit d856d3d7bb
1 changed files with 2 additions and 1 deletions
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@ -340,10 +340,11 @@ cqlsh_extra_syntax_rules = r'''
                         ( "WITH" <copyOption> ( "AND" <copyOption> )* )?
                ;

-<copyOption> ::= [optnames]=<identifier> "=" [optvals]=<copyOptionVal>
+<copyOption> ::= [optnames]=(<identifier>|<reserved_identifier>) "=" [optvals]=<copyOptionVal>
               ;

 <copyOptionVal> ::= <identifier>
+                  | <reserved_identifier>
                  | <stringLiteral>
                  ;