diff options
| author | Pavan Deolasee | 2017-06-15 07:41:07 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-06-15 07:41:07 +0000 |
| commit | 0ffa504a17f58f2bc045b0039f40e4917ee50d20 (patch) | |
| tree | c629c449bcfcc45de1d03b2586e89932d546e8ba /contrib/sepgsql/relation.c | |
| parent | 36ccc8d64e61fe9d77bb7ac62267945f7c146baa (diff) | |
| parent | e800656d9a9b40b2f55afabe76354ab6d93353b3 (diff) | |
Merge 'remotes/PGSQL/master' into xl10devel
Merge upstream master branch upto e800656d9a9b40b2f55afabe76354ab6d93353b3.
Code compiles and regression works ok (with lots and lots of failures though).
Diffstat (limited to 'contrib/sepgsql/relation.c')
| -rw-r--r-- | contrib/sepgsql/relation.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c index 59a6d9be6e..228869a520 100644 --- a/contrib/sepgsql/relation.c +++ b/contrib/sepgsql/relation.c @@ -83,7 +83,7 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum) tuple = systable_getnext(sscan); if (!HeapTupleIsValid(tuple)) - elog(ERROR, "catalog lookup failed for column %d of relation %u", + elog(ERROR, "could not find tuple for column %d of relation %u", attnum, relOid); attForm = (Form_pg_attribute) GETSTRUCT(tuple); @@ -271,7 +271,7 @@ sepgsql_relation_post_create(Oid relOid) tuple = systable_getnext(sscan); if (!HeapTupleIsValid(tuple)) - elog(ERROR, "catalog lookup failed for relation %u", relOid); + elog(ERROR, "could not find tuple for relation %u", relOid); classForm = (Form_pg_class) GETSTRUCT(tuple); @@ -623,7 +623,7 @@ sepgsql_relation_setattr(Oid relOid) newtup = systable_getnext(sscan); if (!HeapTupleIsValid(newtup)) - elog(ERROR, "catalog lookup failed for relation %u", relOid); + elog(ERROR, "could not find tuple for relation %u", relOid); newform = (Form_pg_class) GETSTRUCT(newtup); /* @@ -700,7 +700,7 @@ sepgsql_relation_setattr_extra(Relation catalog, SnapshotSelf, 1, &skey); tuple = systable_getnext(sscan); if (!HeapTupleIsValid(tuple)) - elog(ERROR, "catalog lookup failed for object %u in catalog \"%s\"", + elog(ERROR, "could not find tuple for object %u in catalog \"%s\"", extra_oid, RelationGetRelationName(catalog)); datum = heap_getattr(tuple, anum_relation_id, |