Merge 7a73029 into blathers/backport-release-24.3-133400

cockroachdb · Oct 24, 2024 · 603a4b9 · 603a4b9
2 parents 3ab06e6 + 7a73029
commit 603a4b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/sql/logictest/testdata/logic_test/partial_index b/pkg/sql/logictest/testdata/logic_test/partial_index
@@ -564,10 +564,11 @@ SELECT * FROM h@a_b_foo_idx WHERE b = 'foo'
 1  foo
 
 # Backfill a partial index with a user defined type when a new table is created
-# in the same transaction.
+# in the same transaction. Use a high priority to make it less likely for the
+# transaction to be aborted.
 
 statement ok
-BEGIN
+BEGIN PRIORITY HIGH
 
 statement ok
 CREATE TABLE i (a INT, b enum)

diff --git a/pkg/sql/logictest/testdata/logic_test/synthetic_privileges b/pkg/sql/logictest/testdata/logic_test/synthetic_privileges
@@ -296,8 +296,9 @@ SELECT has_table_privilege('testuser4', 'crdb_internal.feature_usage', 'SELECT')
 ----
 false
 
+# Use a high priority transaction to avoid this transaction being aborted.
 statement ok
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+BEGIN TRANSACTION PRIORITY HIGH ISOLATION LEVEL SERIALIZABLE;
 
 statement ok
 GRANT SELECT ON crdb_internal.feature_usage TO testuser4