5 files changed, 80 insertions, 8 deletions
diff --git a/src/test/regress/expected/oidjoins.out b/src/test/regress/expected/oidjoins.out
index 1302cc271ba..92f9143d06f 100644
--- a/src/test/regress/expected/oidjoins.out
+++ b/src/test/regress/expected/oidjoins.out
@@ -961,6 +961,46 @@ WHERE	staop5 != 0 AND
 ------+--------
 (0 rows)
 
+SELECT	ctid, stacoll1
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll1 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll1);
+ ctid | stacoll1 
+------+----------
+(0 rows)
+
+SELECT	ctid, stacoll2
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll2 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll2);
+ ctid | stacoll2 
+------+----------
+(0 rows)
+
+SELECT	ctid, stacoll3
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll3 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll3);
+ ctid | stacoll3 
+------+----------
+(0 rows)
+
+SELECT	ctid, stacoll4
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll4 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll4);
+ ctid | stacoll4 
+------+----------
+(0 rows)
+
+SELECT	ctid, stacoll5
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll5 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll5);
+ ctid | stacoll5 
+------+----------
+(0 rows)
+
 SELECT	ctid, stxrelid
 FROM	pg_catalog.pg_statistic_ext fk
 WHERE	stxrelid != 0 AND
@@ -1041,6 +1081,14 @@ WHERE	tgrelid != 0 AND
 ------+---------
 (0 rows)
 
+SELECT	ctid, tgparentid
+FROM	pg_catalog.pg_trigger fk
+WHERE	tgparentid != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_trigger pk WHERE pk.oid = fk.tgparentid);
+ ctid | tgparentid 
+------+------------
+(0 rows)
+
 SELECT	ctid, tgfoid
 FROM	pg_catalog.pg_trigger fk
 WHERE	tgfoid != 0 AND
diff --git a/src/test/regress/input/largeobject.source b/src/test/regress/input/largeobject.source
index 7e45b1172ad..f40338ddf88 100644
--- a/src/test/regress/input/largeobject.source
+++ b/src/test/regress/input/largeobject.source
@@ -253,9 +253,9 @@ SELECT lo_get(:newloid);
 
 -- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
 -- this one intentionally has an OID in the system range
-SELECT lo_create(3001);
+SELECT lo_create(2121);
 
-COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+COMMENT ON LARGE OBJECT 2121 IS 'testing comments';
 
 -- Clean up
 DROP TABLE lotest_stash_values;
diff --git a/src/test/regress/output/largeobject.source b/src/test/regress/output/largeobject.source
index 761d7ff3015..ea712a5e2fd 100644
--- a/src/test/regress/output/largeobject.source
+++ b/src/test/regress/output/largeobject.source
@@ -469,13 +469,13 @@ SELECT lo_get(:newloid);
 
 -- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
 -- this one intentionally has an OID in the system range
-SELECT lo_create(3001);
+SELECT lo_create(2121);
  lo_create 
 -----------
-      3001
+      2121
 (1 row)
 
-COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+COMMENT ON LARGE OBJECT 2121 IS 'testing comments';
 -- Clean up
 DROP TABLE lotest_stash_values;
 DROP ROLE regress_lo_user;
diff --git a/src/test/regress/output/largeobject_1.source b/src/test/regress/output/largeobject_1.source
index 7de3e7ea6f6..f01596cea7b 100644
--- a/src/test/regress/output/largeobject_1.source
+++ b/src/test/regress/output/largeobject_1.source
@@ -469,13 +469,13 @@ SELECT lo_get(:newloid);
 
 -- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
 -- this one intentionally has an OID in the system range
-SELECT lo_create(3001);
+SELECT lo_create(2121);
  lo_create 
 -----------
-      3001
+      2121
 (1 row)
 
-COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+COMMENT ON LARGE OBJECT 2121 IS 'testing comments';
 -- Clean up
 DROP TABLE lotest_stash_values;
 DROP ROLE regress_lo_user;
diff --git a/src/test/regress/sql/oidjoins.sql b/src/test/regress/sql/oidjoins.sql
index b774cbca5b6..8a833a23fda 100644
--- a/src/test/regress/sql/oidjoins.sql
+++ b/src/test/regress/sql/oidjoins.sql
@@ -481,6 +481,26 @@ SELECT	ctid, staop5
 FROM	pg_catalog.pg_statistic fk
 WHERE	staop5 != 0 AND
 	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop5);
+SELECT	ctid, stacoll1
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll1 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll1);
+SELECT	ctid, stacoll2
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll2 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll2);
+SELECT	ctid, stacoll3
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll3 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll3);
+SELECT	ctid, stacoll4
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll4 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll4);
+SELECT	ctid, stacoll5
+FROM	pg_catalog.pg_statistic fk
+WHERE	stacoll5 != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_collation pk WHERE pk.oid = fk.stacoll5);
 SELECT	ctid, stxrelid
 FROM	pg_catalog.pg_statistic_ext fk
 WHERE	stxrelid != 0 AND
@@ -521,6 +541,10 @@ SELECT	ctid, tgrelid
 FROM	pg_catalog.pg_trigger fk
 WHERE	tgrelid != 0 AND
 	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.tgrelid);
+SELECT	ctid, tgparentid
+FROM	pg_catalog.pg_trigger fk
+WHERE	tgparentid != 0 AND
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_trigger pk WHERE pk.oid = fk.tgparentid);
 SELECT	ctid, tgfoid
 FROM	pg_catalog.pg_trigger fk
 WHERE	tgfoid != 0 AND