logictest: update logictests data

Update logictest testdata to skip a statement in mixed version
scenarios.

Epic: none

Release note: None

Author: shailendra-patel

pkg/sql/logictest/logictestbase/logictestbase.go

@@ -511,11 +511,6 @@ var LogicTestConfigs = []TestClusterConfig{
 		BootstrapVersion:            clusterversion.V25_3,
 		DisableUpgrade:              true,
 		DeclarativeCorpusCollection: true,
-		// Mixed version clusters do not support disabling schema_locked
-		// automatically, since we added more statements in 25.3.
-		// Note: This can be removed once the mixed version level is 25.3,
-		// since the entire test suite should be compatible.
-		DisableSchemaLockedByDefault: true,
 	},
 	{
 		// This config runs a cluster with 3 nodes, with a separate process per

pkg/sql/logictest/testdata/logic_test/crdb_internal_catalog

@@ -129,7 +129,7 @@ SELECT id, strip_volatile(descriptor) FROM crdb_internal.kv_catalog_descriptor W
 113         {"function": {"functionBody": "SELECT json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(json_remove_path(d, ARRAY['table':::STRING, 'families':::STRING]:::STRING[]), ARRAY['table':::STRING, 'nextFamilyId':::STRING]:::STRING[]), ARRAY['table':::STRING, 'indexes':::STRING, '0':::STRING, 'createdAtNanos':::STRING]:::STRING[]), ARRAY['table':::STRING, 'indexes':::STRING, '1':::STRING, 'createdAtNanos':::STRING]:::STRING[]), ARRAY['table':::STRING, 'indexes':::STRING, '2':::STRING, 'createdAtNanos':::STRING]:::STRING[]), ARRAY['table':::STRING, 'primaryIndex':::STRING, 'createdAtNanos':::STRING]:::STRING[]), ARRAY['table':::STRING, 'createAsOfTime':::STRING]:::STRING[]), ARRAY['table':::STRING, 'modificationTime':::STRING]:::STRING[]), ARRAY['function':::STRING, 'modificationTime':::STRING]:::STRING[]), ARRAY['type':::STRING, 'modificationTime':::STRING]:::STRING[]), ARRAY['schema':::STRING, 'modificationTime':::STRING]:::STRING[]), ARRAY['database':::STRING, 'modificationTime':::STRING]:::STRING[]);", "id": 113, "lang": "SQL", "name": "strip_volatile", "nullInputBehavior": "CALLED_ON_NULL_INPUT", "params": [{"class": "IN", "name": "d", "type": {"family": "JsonFamily", "oid": 3802}}], "parentId": 104, "parentSchemaId": 105, "privileges": {"ownerProto": "root", "users": [{"privileges": "2", "userProto": "admin", "withGrantOption": "2"}, {"privileges": "1048576", "userProto": "public"}, {"privileges": "2", "userProto": "root", "withGrantOption": "2"}], "version": 3}, "returnType": {"type": {"family": "JsonFamily", "oid": 3802}}, "version": "1", "volatility": "STABLE"}}
 4294966962  {"table": {"columns": [{"id": 1, "name": "f_table_catalog", "nullable": true, "type": {"family": 11, "oid": 19}}, {"id": 2, "name": "f_table_schema", "nullable": true, "type": {"family": 11, "oid": 19}}, {"id": 3, "name": "f_table_name", "nullable": true, "type": {"family": 11, "oid": 19}}, {"id": 4, "name": "f_geometry_column", "nullable": true, "type": {"family": 11, "oid": 19}}, {"id": 5, "name": "coord_dimension", "nullable": true, "type": {"family": "IntFamily", "oid": 20, "width": 64}}, {"id": 6, "name": "srid", "nullable": true, "type": {"family": "IntFamily", "oid": 20, "width": 64}}, {"id": 7, "name": "type", "nullable": true, "type": {"family": "StringFamily", "oid": 25}}], "formatVersion": 3, "id": 4294966962, "name": "geometry_columns", "nextColumnId": 8, "nextConstraintId": 2, "nextIndexId": 2, "nextMutationId": 1, "primaryIndex": {"constraintId": 1, "foreignKey": {}, "geoConfig": {}, "id": 1, "interleave": {}, "partitioning": {}, "sharded": {}, "vecConfig": {}}, "privileges": {"ownerProto": "node", "users": [{"privileges": "32", "userProto": "public"}], "version": 3}, "replacementOf": {"time": {}}, "unexposedParentSchemaId": 4294966964, "version": "1"}}
 
-skipif config schema-locked-disabled
+skipif config schema-locked-disabled local-mixed-25.3
 query IT
 SELECT id, strip_volatile(descriptor) FROM crdb_internal.kv_catalog_descriptor WHERE id IN (1, 2, 3, 29, 4294966962) OR (id > 100 and id < 200) ORDER BY id
 ----

pkg/sql/logictest/testdata/logic_test/owner

@@ -258,46 +258,46 @@ DROP ROLE testuser
 
 user root
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 let $testuser_job_id
 SELECT id FROM system.jobs WHERE owner = 'testuser' LIMIT 1
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 let $testuser2_job_id
 SELECT id FROM system.jobs WHERE owner = 'testuser2' LIMIT 1
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 let $node_job_id
 SELECT id FROM system.jobs WHERE owner = 'node' LIMIT 1
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 # Verify a simple transfer by an admin from testuser to testuser2 and back.
 statement ok
 ALTER JOB $testuser_job_id OWNER TO testuser2
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 query T
 SELECT owner FROM system.jobs WHERE id = $testuser_job_id
 ----
 testuser2
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 statement ok
 ALTER JOB $testuser_job_id OWNER TO testuser
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 query T
 SELECT owner FROM system.jobs WHERE id = $testuser_job_id
 ----
 testuser
 
 # Verify that ownership cannot transfer to or from 'node'.
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 statement error cannot transfer ownership
 ALTER JOB $node_job_id OWNER TO testuser
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 statement error cannot transfer ownership
 ALTER JOB $testuser_job_id OWNER TO node
 
@@ -316,58 +316,58 @@ CREATE USER testuser3
 statement ok
 GRANT testrole TO testuser3
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 statement ok
 ALTER JOB $testuser_job_id OWNER TO testrole
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 query T
 SELECT owner FROM system.jobs WHERE id = $testuser_job_id
 ----
 testrole
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 # Verify testuser2 can transfer ownership to themselves and back to testuser.
 statement ok
 ALTER JOB $testuser_job_id OWNER TO testuser2
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 query T
 SELECT owner FROM system.jobs WHERE id = $testuser_job_id
 ----
 testuser2
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 statement ok
 ALTER JOB $testuser_job_id OWNER TO testuser
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 query T
 SELECT owner FROM system.jobs WHERE id = $testuser_job_id
 ----
 testuser
 
 user testuser3
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 # Verify testuser3 cannot transfer since they do not own it, including via role.
 statement error testuser3 does not own job
 ALTER JOB $testuser_job_id OWNER TO testuser3
 
 # Now move ownership to testrole so testuser3 can transfer it.
 user testuser2
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 statement ok
 ALTER JOB $testuser_job_id OWNER TO testrole
 
 user testuser3
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 statement ok
 ALTER JOB $testuser_job_id OWNER TO testuser3
 
-skipif config local-mixed-25.2
+skipif config local-mixed-25.2 local-mixed-25.3 
 # Verify testuser3, who is not an admin, cannot transfer to otherrole which they
 # are not a member of.
 statement error testuser3 cannot transfer ownership to otherrole

pkg/sql/logictest/testdata/logic_test/row_level_security

@@ -1,4 +1,4 @@
-# LogicTest: !local-legacy-schema-changer !local-mixed-25.2
+# LogicTest: !local-legacy-schema-changer !local-mixed-25.2 !local-mixed-25.3
 
 subtest setup