Commiteacb22e

committed

Fix duplicate OIDs introduced by SECURITY LABEL patch.

Report by Shigeru Hanada.

1 parent62b6aaa commiteacb22eCopy full SHA for eacb22e

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,8 @@ DECLARE_UNIQUE_INDEX(pg_default_acl_oid_index, 828, on pg_default_acl using btre`
`281`	`281`	`DECLARE_UNIQUE_INDEX(pg_db_role_setting_databaseid_rol_index,2965,onpg_db_role_settingusingbtree(setdatabaseoid_ops,setroleoid_ops));`
`282`	`282`	`#defineDbRoleSettingDatidRolidIndexId2965`
`283`	`283`
`284`		`-DECLARE_UNIQUE_INDEX(pg_seclabel_object_index,3038,onpg_seclabelusingbtree(objoidoid_ops,classoidoid_ops,objsubidint4_ops,providertext_ops));`
`285`		`-#defineSecLabelObjectIndexId3038`
	`284`	`+DECLARE_UNIQUE_INDEX(pg_seclabel_object_index,3597,onpg_seclabelusingbtree(objoidoid_ops,classoidoid_ops,objsubidint4_ops,providertext_ops));`
	`285`	`+#defineSecLabelObjectIndexId3597`
`286`	`286`
`287`	`287`	`/* last step of initialization script: build the indexes declared above */`
`288`	`288`	`BUILD_INDICES`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@`
`18`	`18`	`*typedef struct FormData_pg_seclabel`
`19`	`19`	`* ----------------`
`20`	`20`	`*/`
`21`		`-#defineSecLabelRelationId3037`
	`21`	`+#defineSecLabelRelationId3596`
`22`	`22`
`23`		`-CATALOG(pg_seclabel,3037)BKI_WITHOUT_OIDS`
	`23`	`+CATALOG(pg_seclabel,3596)BKI_WITHOUT_OIDS`
`24`	`24`	`{`
`25`	`25`	`Oidobjoid;/* OID of the object itself */`
`26`	`26`	`Oidclassoid;/* OID of table containing the object */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ DECLARE_TOAST(pg_constraint, 2832, 2833);`
`45`	`45`	`DECLARE_TOAST(pg_description,2834,2835);`
`46`	`46`	`DECLARE_TOAST(pg_proc,2836,2837);`
`47`	`47`	`DECLARE_TOAST(pg_rewrite,2838,2839);`
`48`		`-DECLARE_TOAST(pg_seclabel,3039,3040);`
	`48`	`+DECLARE_TOAST(pg_seclabel,3598,3599);`
`49`	`49`	`DECLARE_TOAST(pg_statistic,2840,2841);`
`50`	`50`	`DECLARE_TOAST(pg_trigger,2336,2337);`
`51`	`51`

Comments

(0)