diff --git a/CHANGES.txt b/CHANGES.txt index b35ff548b2..d2bf6142c9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,7 @@ * Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767) * Add a guardrail for misprepared statements (CASSANDRA-21139) Merged from 6.0: + * Fix Accord transaction error message when altering a table (CASSANDRA-20580) * Depend only on platform-specific Zstd JNI native libraries (CASSANDRA-21483) * Expose immediately-executed tasks in the queries virtual table (CASSANDRA-21471) * Avoid potential deadlock between GlobalLogFollower and GossipStage (CASSANDRA-21384) diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java index aee1496cb5..09501c8446 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java @@ -653,7 +653,7 @@ public abstract class AlterTableStatement extends AlterSchemaStatement boolean forceMigrationChange = modeChange && explicitlySetMigrationFrom && next.transactionalMigrationFrom != newMigrateFrom; if (modeChange && next.transactionalMode.accordIsEnabled && !DatabaseDescriptor.getAccordTransactionsEnabled()) - throw ire(format("Cannot change transactional mode to %s for %s.%s with accord_transactions_enabled set to false", + throw ire(format("Cannot change transactional mode to %s for %s.%s with accord.enabled set to false", next.transactionalMode, keyspaceName, tableName)); // user is manually updating migration mode, don't interfere