diff options
| author | Robert Haas <rhaas@postgresql.org> | 2010-09-28 07:03:10 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2010-09-28 07:07:03 -0400 |
| commit | eacb22ec476a7bc49bdb2054a76a2b27a429a295 (patch) | |
| tree | 6c473bf655250a15d50efe24479d10bdf2812f09 /src | |
| parent | 62b6aaa40b2abb26edf18d1cd00dffcac090f67a (diff) | |
Fix duplicate OIDs introduced by SECURITY LABEL patch.
Report by Shigeru Hanada.
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/indexing.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_seclabel.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/toasting.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 74f1e2418fa..c9212ab584b 100644 --- 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 9fa11c5da05..b7c9849314e 100644 --- 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 1fd7451ad00..67ad213beb0 100644 --- 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 1e59cd21d24..68a02577426 100644 --- 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); |