summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorBruce Momjian2014-08-07 18:56:13 +0000
committerBruce Momjian2014-08-07 18:56:13 +0000
commit4c6780fd17aa43ed6362aa682499cc2f9712cc8b (patch)
treecd92b289888c04beaf5775ecee391c1a31b10cac /src/include
parentec903d20e3b4c1a543dbf057055e4ddbfad4d59e (diff)
pg_upgrade: prevent oid conflicts with new-cluster TOAST tables
Previously, TOAST tables only required in the new cluster could cause oid conflicts if they were auto-numbered and a later conflicting oid had to be assigned. Backpatch through 9.3
Diffstat (limited to 'src/include')
-rw-r--r--src/include/catalog/binary_upgrade.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/include/catalog/binary_upgrade.h b/src/include/catalog/binary_upgrade.h
index f39017cfdf0..63fa85ed99e 100644
--- a/src/include/catalog/binary_upgrade.h
+++ b/src/include/catalog/binary_upgrade.h
@@ -14,6 +14,11 @@
#ifndef BINARY_UPGRADE_H
#define BINARY_UPGRADE_H
+#include "catalog/pg_authid.h"
+
+/* pick a OID that will never be used for TOAST tables */
+#define OPTIONALLY_CREATE_TOAST_OID BOOTSTRAP_SUPERUSERID
+
extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_oid;
extern PGDLLIMPORT Oid binary_upgrade_next_array_pg_type_oid;
extern PGDLLIMPORT Oid binary_upgrade_next_toast_pg_type_oid;