Merge pull request #92305 from cockroachdb/blathers/backport-release-…

…22.2-92300

Fixes #82921

pkg/ccl/benchccl/rttanalysisccl/testdata/benchmark_expectations

@@ -1,19 +1,19 @@
 exp,benchmark
-15,AlterPrimaryRegion/alter_empty_database_alter_primary_region
-19,AlterPrimaryRegion/alter_empty_database_set_initial_primary_region
-15,AlterPrimaryRegion/alter_populated_database_alter_primary_region
-20,AlterPrimaryRegion/alter_populated_database_set_initial_primary_region
-13,AlterRegions/alter_empty_database_add_region
-15,AlterRegions/alter_empty_database_drop_region
-13,AlterRegions/alter_populated_database_add_region
-15,AlterRegions/alter_populated_database_drop_region
-15,AlterSurvivalGoals/alter_empty_database_from_region_to_zone
-15,AlterSurvivalGoals/alter_empty_database_from_zone_to_region
-35,AlterSurvivalGoals/alter_populated_database_from_region_to_zone
-35,AlterSurvivalGoals/alter_populated_database_from_zone_to_region
-16,AlterTableLocality/alter_from_global_to_rbr
-16,AlterTableLocality/alter_from_global_to_regional_by_table
-12,AlterTableLocality/alter_from_rbr_to_global
-12,AlterTableLocality/alter_from_rbr_to_regional_by_table
-16,AlterTableLocality/alter_from_regional_by_table_to_global
-16,AlterTableLocality/alter_from_regional_by_table_to_rbr
+14,AlterPrimaryRegion/alter_empty_database_alter_primary_region
+17,AlterPrimaryRegion/alter_empty_database_set_initial_primary_region
+14,AlterPrimaryRegion/alter_populated_database_alter_primary_region
+18,AlterPrimaryRegion/alter_populated_database_set_initial_primary_region
+12,AlterRegions/alter_empty_database_add_region
+14,AlterRegions/alter_empty_database_drop_region
+12,AlterRegions/alter_populated_database_add_region
+14,AlterRegions/alter_populated_database_drop_region
+14,AlterSurvivalGoals/alter_empty_database_from_region_to_zone
+14,AlterSurvivalGoals/alter_empty_database_from_zone_to_region
+34,AlterSurvivalGoals/alter_populated_database_from_region_to_zone
+34,AlterSurvivalGoals/alter_populated_database_from_zone_to_region
+15,AlterTableLocality/alter_from_global_to_rbr
+15,AlterTableLocality/alter_from_global_to_regional_by_table
+11,AlterTableLocality/alter_from_rbr_to_global
+11,AlterTableLocality/alter_from_rbr_to_regional_by_table
+15,AlterTableLocality/alter_from_regional_by_table_to_global
+15,AlterTableLocality/alter_from_regional_by_table_to_rbr

pkg/sql/conn_executor_prepare.go

@@ -456,15 +456,6 @@ func (ex *connExecutor) execBind(
 		}
 	}
 
-	// This is a huge kludge to deal with the fact that we're resolving types
-	// using a planner with a committed transaction. This ends up being almost
-	// okay because the execution is going to re-acquire leases on these types.
-	// Regardless, holding this lease is worse than not holding it. Users might
-	// expect to get type mismatch errors if a rename of the type occurred.
-	if ex.getTransactionState() == NoTxnStateStr {
-		ex.planner.Descriptors().ReleaseAll(ctx)
-	}
-
 	// Create the new PreparedPortal.
 	if err := ex.addPortal(ctx, portalName, ps, qargs, columnFormatCodes); err != nil {
 		return retErr(err)

pkg/sql/pgwire/testdata/pgtest/schema_changes_implicit_txn_with_bind

@@ -0,0 +1,36 @@
+# This test exercises running schema changes in an implicit transaction using
+# the extended protocol with Bind operations. This is a regression test for
+# issue #82921.
+
+send
+Query {"String": "CREATE TABLE \"User\"\r\n(\r\n  \"UserID\" integer primary key\r\n);"}
+----
+
+until
+ReadyForQuery
+----
+{"Type":"CommandComplete","CommandTag":"CREATE TABLE"}
+{"Type":"ReadyForQuery","TxStatus":"I"}
+
+send
+Parse {"Query": "ALTER TABLE \"User\" ADD \"SponsorID\" INT NULL;"}
+Bind
+Execute
+Parse {"Query": "CREATE INDEX User_SponsorID_IDX ON \"User\" (\"SponsorID\");"}
+Bind
+Describe {"ObjectType": "P", "Name": ""}
+Execute
+Sync
+----
+
+until
+ReadyForQuery
+----
+{"Type":"ParseComplete"}
+{"Type":"BindComplete"}
+{"Type":"CommandComplete","CommandTag":"ALTER TABLE"}
+{"Type":"ParseComplete"}
+{"Type":"BindComplete"}
+{"Type":"NoData"}
+{"Type":"CommandComplete","CommandTag":"CREATE INDEX"}
+{"Type":"ReadyForQuery","TxStatus":"I"}