aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-04-25 12:00:21 -0400
committerBruce Momjian <bruce@momjian.us>2011-04-25 12:00:21 -0400
commit76dd09bbec893c02376e3440a6a86a3b994d804c (patch)
tree721a384f3511d2dc72642afeea48629019a15bb3 /src/backend/commands
parent02e6a115cc6149551527a45545fd1ef8d37e6aa0 (diff)
downloadpostgresql-76dd09bbec893c02376e3440a6a86a3b994d804c.tar.gz
postgresql-76dd09bbec893c02376e3440a6a86a3b994d804c.zip
Add postmaster/postgres undocumented -b option for binary upgrades.
This option turns off autovacuum, prevents non-super-user connections, and enables oid setting hooks in the backend. The code continues to use the old autoavacuum disable settings for servers with earlier catalog versions. This includes a catalog version bump to identify servers that support the -b option.
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;