diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-10-01 21:24:56 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-10-09 22:48:41 -0400 |
| commit | 264aa14a2f687eba8c8cc2a5b6cbd6397973da98 (patch) | |
| tree | fa09ac5e9755f556542e71c4f74d8881438822a2 /contrib/pg_upgrade/info.c | |
| parent | 261c7d4b653bc3e44c31fd456d94f292caa50d8f (diff) | |
pg_upgrade: Split off pg_fatal() from pg_log()
This allows decorating pg_fatal() with noreturn compiler hints, leading
to better diagnostics.
Reviewed-by: Marko Tiikkaja <marko@joh.to>
Diffstat (limited to 'contrib/pg_upgrade/info.c')
| -rw-r--r-- | contrib/pg_upgrade/info.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index 18daf1c32f7..46054b35d9c 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -51,7 +51,7 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, RelInfo *new_rel = &new_db->rel_arr.rels[relnum]; if (old_rel->reloid != new_rel->reloid) - pg_log(PG_FATAL, "Mismatch of relation OID in database \"%s\": old OID %d, new OID %d\n", + pg_fatal("Mismatch of relation OID in database \"%s\": old OID %d, new OID %d\n", old_db->db_name, old_rel->reloid, new_rel->reloid); /* @@ -68,7 +68,7 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, ((GET_MAJOR_VERSION(old_cluster.major_version) >= 900 || strcmp(old_rel->nspname, "pg_toast") != 0) && strcmp(old_rel->relname, new_rel->relname) != 0)) - pg_log(PG_FATAL, "Mismatch of relation names in database \"%s\": " + pg_fatal("Mismatch of relation names in database \"%s\": " "old name \"%s.%s\", new name \"%s.%s\"\n", old_db->db_name, old_rel->nspname, old_rel->relname, new_rel->nspname, new_rel->relname); @@ -83,7 +83,7 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, * error above */ if (old_db->rel_arr.nrels != new_db->rel_arr.nrels) - pg_log(PG_FATAL, "old and new databases \"%s\" have a different number of relations\n", + pg_fatal("old and new databases \"%s\" have a different number of relations\n", old_db->db_name); *nmaps = num_maps; |