Merge branch 'cassandra-3.11' into trunk

2018-02-01 20:29:41 +00:00 · 2018-02-01 20:29:41 +00:00 · 59a4624d5f
parent bfecdf5205 6b00767427
commit 59a4624d5f
2 changed files with 6 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -185,6 +185,7 @@


 3.11.2
+ * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205)
 * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
 * Enable CDC unittest (CASSANDRA-14141)
 * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139)
--- a/src/java/org/apache/cassandra/cql3/ReservedKeywords.java
+++ b/src/java/org/apache/cassandra/cql3/ReservedKeywords.java
@ -85,7 +85,11 @@ class ReservedKeywords
                                                     "NAN",
                                                     "INFINITY",
                                                     "OR",
-                                                     "REPLACE" };
+                                                     "REPLACE",
+                                                     "DEFAULT",
+                                                     "UNSET",
+                                                     "MBEAN",
+                                                     "MBEANS"};

    private static final Set<String> reservedSet = ImmutableSet.copyOf(reservedKeywords);