aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/commands')
-rw-r--r--src/backend/commands/typecmds.c2
-rw-r--r--src/backend/commands/user.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 7388e5a3db9..f8eb5bc4a65 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -1550,7 +1550,7 @@ AssignTypeArrayOid(void)
Oid type_array_oid;
/* Use binary-upgrade override for pg_type.typarray, if supplied. */
- if (OidIsValid(binary_upgrade_next_array_pg_type_oid))
+ if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_array_pg_type_oid))
{
type_array_oid = binary_upgrade_next_array_pg_type_oid;
binary_upgrade_next_array_pg_type_oid = InvalidOid;
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 3f7d4992af8..838d6eba205 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -388,7 +388,7 @@ CreateRole(CreateRoleStmt *stmt)
* pg_largeobject_metadata contains pg_authid.oid's, so we use the
* binary-upgrade override, if specified.
*/
- if (OidIsValid(binary_upgrade_next_pg_authid_oid))
+ if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_pg_authid_oid))
{
HeapTupleSetOid(tuple, binary_upgrade_next_pg_authid_oid);
binary_upgrade_next_pg_authid_oid = InvalidOid;