Merge #102187

102187: sql/tests: deflake TestErrorDuringExtendedProtocolCommit (again) r=rafiss a=rafiss

This fixes a race condition with how the error gets injected.

fixes #101217
Release note: None

Co-authored-by: Rafi Shamim <[email protected]>

pkg/sql/tests/autocommit_extended_protocol_test.go

@@ -170,12 +170,12 @@ func TestErrorDuringExtendedProtocolCommit(t *testing.T) {
 		},
 		BeforeAutoCommit: func(ctx context.Context, stmt string) error {
 			if shouldErrorOnAutoCommit.Get() {
-				shouldErrorOnAutoCommit.Set(false)
 				// Only inject the error if we're in the same trace as the one we
 				// saw when executing our test query. This is so we know that this
 				// autocommit corresponds to our test qyery rather than an internal
 				// query.
 				if traceID == tracing.SpanFromContext(ctx).TraceID() {
+					shouldErrorOnAutoCommit.Set(false)
 					return errors.New("injected error")
 				}
 			}