Revert "sql: temporarily switch back to WaitForOneVersion for table

version bumps"

This reverts commit 6e91815 with some
changes.

Release note: None

Author: bghal

pkg/sql/catalog/lease/lease_test.go

@@ -557,8 +557,6 @@ func TestWaitForNewVersion(testingT *testing.T) {
 	defer leaktest.AfterTest(testingT)()
 	defer log.Scope(testingT).Close(testingT)
 
-	skip.WithIssue(testingT, 152051)
-
 	var params base.TestClusterArgs
 	params.ServerArgs.Knobs = base.TestingKnobs{
 		SQLLeaseManager: &lease.ManagerTestingKnobs{

pkg/sql/conn_executor_jobs.go

@@ -84,9 +84,7 @@ func (ex *connExecutor) waitForNewVersionPropagation(
 			continue
 		}
 
-		// TODO(sql-foundations): Change this back to WaitForNewVersion once we
-		// address the flaky behavior around privilege and role membership caching.
-		if _, err := ex.planner.LeaseMgr().WaitForOneVersion(ex.Ctx(), idVersion.ID, cachedRegions,
+		if _, err := ex.planner.LeaseMgr().WaitForNewVersion(ex.Ctx(), idVersion.ID, cachedRegions,
 			retry.Options{
 				InitialBackoff: time.Millisecond,
 				MaxBackoff:     time.Second,

pkg/sql/tests/allow_user_create_during_transaction_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -25,8 +24,6 @@ func TestAllowUserCreateDuringTransaction(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	skip.WithIssue(t, 152043)
-
 	ctx := context.Background()
 	s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{})
 	defer s.Stopper().Stop(ctx)