diff --git a/CHANGES.txt b/CHANGES.txt index a2e36542dc..91b3ed8ee2 100644 --- 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) diff --git a/src/java/org/apache/cassandra/cql3/ReservedKeywords.java b/src/java/org/apache/cassandra/cql3/ReservedKeywords.java index ee052a7376..30b1a6ed91 100644 --- 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 reservedSet = ImmutableSet.copyOf(reservedKeywords);