Fix duplicate OIDs introduced by SECURITY LABEL patch.

Report by Shigeru Hanada.

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 74f1e2418fae2c990e386367a653bb1801a77055..c9212ab584bcd91cb25ff137779b2ff2941b5c4f 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201009271
+#define CATALOG_VERSION_NO     201009281
 
 #endif

diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index 9fa11c5da05793a4d686539a363516207030ac93..b7c9849314eb1dc2f468ea0a3c22fe2e63de2b67 100644 (file)
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -281,8 +281,8 @@ DECLARE_UNIQUE_INDEX(pg_default_acl_oid_index, 828, on pg_default_acl using btre
 DECLARE_UNIQUE_INDEX(pg_db_role_setting_databaseid_rol_index, 2965, on pg_db_role_setting using btree(setdatabase oid_ops, setrole oid_ops));
 #define DbRoleSettingDatidRolidIndexId 2965
 
-DECLARE_UNIQUE_INDEX(pg_seclabel_object_index, 3038, on pg_seclabel using btree(objoid oid_ops, classoid oid_ops, objsubid int4_ops, provider text_ops));
-#define SecLabelObjectIndexId                          3038
+DECLARE_UNIQUE_INDEX(pg_seclabel_object_index, 3597, on pg_seclabel using btree(objoid oid_ops, classoid oid_ops, objsubid int4_ops, provider text_ops));
+#define SecLabelObjectIndexId                          3597
 
 /* last step of initialization script: build the indexes declared above */
 BUILD_INDICES

diff --git a/src/include/catalog/pg_seclabel.h b/src/include/catalog/pg_seclabel.h
index 1fd7451ad0043af7500957c74f392859107546d8..67ad213beb0fedb089c75e83de3b7dd5f99f3b1a 100644 (file)
--- a/src/include/catalog/pg_seclabel.h
+++ b/src/include/catalog/pg_seclabel.h
@@ -18,9 +18,9 @@
  *             typedef struct FormData_pg_seclabel
  * ----------------
  */
-#define SecLabelRelationId             3037
+#define SecLabelRelationId             3596
 
-CATALOG(pg_seclabel,3037) BKI_WITHOUT_OIDS
+CATALOG(pg_seclabel,3596) BKI_WITHOUT_OIDS
 {
        Oid                     objoid;         /* OID of the object itself */
        Oid                     classoid;       /* OID of table containing the object */

diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h
index 1e59cd21d248d75c51155b74c154eed2e78a49af..68a025774262d805a70a55a417a1529f753ba59c 100644 (file)
--- a/src/include/catalog/toasting.h
+++ b/src/include/catalog/toasting.h
@@ -45,7 +45,7 @@ DECLARE_TOAST(pg_constraint, 2832, 2833);
 DECLARE_TOAST(pg_description, 2834, 2835);
 DECLARE_TOAST(pg_proc, 2836, 2837);
 DECLARE_TOAST(pg_rewrite, 2838, 2839);
-DECLARE_TOAST(pg_seclabel, 3039, 3040);
+DECLARE_TOAST(pg_seclabel, 3598, 3599);
 DECLARE_TOAST(pg_statistic, 2840, 2841);
 DECLARE_TOAST(pg_trigger, 2336, 2337);