release-25.3: sql: reset schema_locked correctly in a mixed version state #149335
+15
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fqazi
force-pushed
the
blathers/backport-release-25.3-149271
branch
from
bec0ff6 to
8522207
Compare
blathers-crl
bot
added
blathers-backport
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=95b789b1d594ac6b74f377aa7555d8d98d63240d&v=4){kind=avatar}
|
Thanks for opening a backport. Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate. |
blathers-crl
bot
added
the
backport
|
This change is |
rafiss
approved these changes
Jul 2, 2025
Previously, when schema_locked was reset it would always adopt the value from create_table_with_schema_locked. This was incorrect, since this setting should only adopted if the cluster is running on 25.3. This patch adds a version gate in the reset logic. Fixes: cockroachdb#149266 Release note: None
fqazi
force-pushed
the
blathers/backport-release-25.3-149271
branch
from
8522207 to
e4615fb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 1/1 commits from #149271 on behalf of @fqazi.
Previously, when schema_locked was reset it would always adopt the value from create_table_with_schema_locked. This was incorrect, since this setting should only adopted if the cluster is running on 25.3. This patch adds a version gate in the reset logic.
Fixes: #149266
Release note: None
Release justification: low risk change for incorrect behavior in a mixed version state