Skip to content

Commit a94de9c

Browse files
committed
sql: turn stored proc extended protocol fix on
This commit flips `use_proc_txn_control_extended_protocol_fix` on by default. This will make the fix active in v25.3+. Informs #147701 Release note: None
1 parent ae5ce71 commit a94de9c

File tree

5 files changed

+5
-25
lines changed

5 files changed

+5
-25
lines changed

pkg/sql/logictest/testdata/logic_test/information_schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4137,7 +4137,7 @@ unsafe_allow_triggers_modifying_cascades off
41374137
use_cputs_on_non_unique_indexes off
41384138
use_improved_routine_dependency_tracking on
41394139
use_pre_25_2_variadic_builtins off
4140-
use_proc_txn_control_extended_protocol_fix off
4140+
use_proc_txn_control_extended_protocol_fix on
41414141
variable_inequality_lookup_join_enabled on
41424142
vector_search_beam_size 32
41434143
xmloption content

pkg/sql/logictest/testdata/logic_test/pg_catalog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3132,7 +3132,7 @@ use_cputs_on_non_unique_indexes off
31323132
use_declarative_schema_changer on NULL NULL NULL string
31333133
use_improved_routine_dependency_tracking on NULL NULL NULL string
31343134
use_pre_25_2_variadic_builtins off NULL NULL NULL string
3135-
use_proc_txn_control_extended_protocol_fix off NULL NULL NULL string
3135+
use_proc_txn_control_extended_protocol_fix on NULL NULL NULL string
31363136
variable_inequality_lookup_join_enabled on NULL NULL NULL string
31373137
vector_search_beam_size 32 NULL NULL NULL string
31383138
vectorize on NULL NULL NULL string
@@ -3367,7 +3367,7 @@ use_cputs_on_non_unique_indexes off
33673367
use_declarative_schema_changer on NULL user NULL on on
33683368
use_improved_routine_dependency_tracking on NULL user NULL on on
33693369
use_pre_25_2_variadic_builtins off NULL user NULL off off
3370-
use_proc_txn_control_extended_protocol_fix off NULL user NULL off off
3370+
use_proc_txn_control_extended_protocol_fix on NULL user NULL on on
33713371
variable_inequality_lookup_join_enabled on NULL user NULL on on
33723372
vector_search_beam_size 32 NULL user NULL 32 32
33733373
vectorize on NULL user NULL on on

pkg/sql/logictest/testdata/logic_test/show_source

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ use_cputs_on_non_unique_indexes off
246246
use_declarative_schema_changer on
247247
use_improved_routine_dependency_tracking on
248248
use_pre_25_2_variadic_builtins off
249-
use_proc_txn_control_extended_protocol_fix off
249+
use_proc_txn_control_extended_protocol_fix on
250250
variable_inequality_lookup_join_enabled on
251251
vector_search_beam_size 32
252252
vectorize on

pkg/sql/pgwire/testdata/pgtest/procedure

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,6 @@ ReadyForQuery
7575
{"Type":"CommandComplete","CommandTag":"CALL"}
7676
{"Type":"ReadyForQuery","TxStatus":"I"}
7777

78-
send crdb_only
79-
Query {"String": "SET use_proc_txn_control_extended_protocol_fix = true"}
80-
----
81-
82-
until crdb_only
83-
ReadyForQuery
84-
----
85-
{"Type":"CommandComplete","CommandTag":"SET"}
86-
{"Type":"ReadyForQuery","TxStatus":"I"}
87-
8878
send
8979
Parse {"Name": "foo", "Query": "CALL p()"}
9080
Bind {"DestinationPortal": "foo", "PreparedStatement": "foo"}
@@ -104,13 +94,3 @@ ReadyForQuery
10494
{"Severity":"NOTICE","SeverityUnlocalized":"NOTICE","Code":"00000","Message":"baz","Detail":"","Hint":"","Position":0,"InternalPosition":0,"InternalQuery":"","Where":"","SchemaName":"","TableName":"","ColumnName":"","DataTypeName":"","ConstraintName":"","File":"builtins.go","Line":0,"Routine":"func378","UnknownFields":null}
10595
{"Type":"CommandComplete","CommandTag":"CALL"}
10696
{"Type":"ReadyForQuery","TxStatus":"I"}
107-
108-
send crdb_only
109-
Query {"String": "RESET use_proc_txn_control_extended_protocol_fix"}
110-
----
111-
112-
until crdb_only
113-
ReadyForQuery
114-
----
115-
{"Type":"CommandComplete","CommandTag":"RESET"}
116-
{"Type":"ReadyForQuery","TxStatus":"I"}

pkg/sql/vars.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4158,7 +4158,7 @@ var varGen = map[string]sessionVar{
41584158
Get: func(evalCtx *extendedEvalContext, _ *kv.Txn) (string, error) {
41594159
return formatBoolAsPostgresSetting(evalCtx.SessionData().UseProcTxnControlExtendedProtocolFix), nil
41604160
},
4161-
GlobalDefault: globalFalse,
4161+
GlobalDefault: globalTrue,
41624162
},
41634163
}
41644164

0 commit comments

Comments
 (0)