Merge pull request #62309 from evillique/fix-data-race-in-context

Fix data race in LocalServer
This commit is contained in:
Nikolay Degterinsky 2024-04-29 14:42:27 +00:00 committed by GitHub
commit 18925987d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -481,7 +481,6 @@ try
registerFormats();
processConfig();
adjustSettings();
initTTYBuffer(toProgressOption(config().getString("progress", "default")));
ASTAlterCommand::setFormatAlterCommandsWithParentheses(true);
@ -689,6 +688,7 @@ void LocalServer::processConfig()
/// NOTE: it is important to apply any overrides before
/// setDefaultProfiles() calls since it will copy current context (i.e.
/// there is separate context for Buffer tables).
adjustSettings();
applySettingsOverridesForLocal(global_context);
applyCmdOptions(global_context);