diff --git a/go/libraries/doltcore/sqle/system_variables.go b/go/libraries/doltcore/sqle/system_variables.go index 109aaeec1c..2ab369db27 100644 --- a/go/libraries/doltcore/sqle/system_variables.go +++ b/go/libraries/doltcore/sqle/system_variables.go @@ -73,7 +73,7 @@ func AddDoltSystemVariables() { }, { Name: ReplicateHeadsKey, - Scope: sql.SystemVariableScope_Session, + Scope: sql.SystemVariableScope_Both, Dynamic: true, SetVarHintApplies: false, Type: sql.NewSystemStringType(ReplicateHeadsKey), @@ -81,7 +81,7 @@ func AddDoltSystemVariables() { }, { Name: ReplicateAllHeadsKey, - Scope: sql.SystemVariableScope_Session, + Scope: sql.SystemVariableScope_Both, Dynamic: true, SetVarHintApplies: false, Type: sql.NewSystemBoolType(ReplicateAllHeadsKey), diff --git a/integration-tests/bats/sql-server-config.bats b/integration-tests/bats/sql-server-config.bats index 141ea2f9cc..6dddf34242 100644 --- a/integration-tests/bats/sql-server-config.bats +++ b/integration-tests/bats/sql-server-config.bats @@ -54,6 +54,26 @@ teardown() { [[ "$output" =~ "sqlserver.global.max_connections = 1000" ]] || false } +@test "sql-server-config: dolt_replicate_heads is global variable" { + cd repo1 + start_sql_server repo1 + + insert_query repo1 1 "SET @@GLOBAL.dolt_replicate_heads = main" + server_query repo1 1 "select @@GLOBAL.dolt_replicate_heads" "@@GLOBAL.dolt_replicate_heads\nmain" + server_query repo1 1 "select @@SESSION.dolt_replicate_heads" "@@SESSION.dolt_replicate_heads\nmain" + server_query repo1 1 "select @@dolt_replicate_heads" "@@SESSION.dolt_replicate_heads\nmain" +} + +@test "sql-server-config: dolt_replicate_all_heads is global variable" { + cd repo1 + start_sql_server repo1 + + insert_query repo1 1 "SET @@GLOBAL.dolt_replicate_all_heads = 1" + server_query repo1 1 "select @@GLOBAL.dolt_replicate_all_heads" "@@GLOBAL.dolt_replicate_all_heads\n1" + server_query repo1 1 "select @@SESSION.dolt_replicate_all_heads" "@@SESSION.dolt_replicate_all_heads\n1" + server_query repo1 1 "select @@dolt_replicate_all_heads" "@@SESSION.dolt_replicate_all_heads\n1" +} + @test "sql-server-config: dolt_transaction_commit is global variable" { cd repo1 start_sql_server repo1