From: Michael Paquier Date: Sat, 11 May 2019 04:01:24 +0000 (+0900) Subject: Fix error reporting in reindexdb X-Git-Tag: REL9_5_18~27 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e17fba8d8f13a52b544478481c9505e2efe99dc2;p=postgresql Fix error reporting in reindexdb When failing to reindex a table or an index, reindexdb would generate an extra error message related to a database failure, which is misleading. Backpatch all the way down, as this has been introduced by 85e9a5a0. Discussion: https://postgr.es/m/CAOBaU_Yo61RwNO3cW6WVYWwH7EYMPuexhKqufb2nFGOdunbcHw@mail.gmail.com Author: Julien Rouhaud Reviewed-by: Daniel Gustafsson, Álvaro Herrera, Tom Lane, Michael Paquier Backpatch-through: 9.4 --- diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index 4151f1f440..f71b9b3e95 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -306,10 +306,10 @@ reindex_one_database(const char *name, const char *dbname, const char *type, if (strcmp(type, "TABLE") == 0) fprintf(stderr, _("%s: reindexing of table \"%s\" in database \"%s\" failed: %s"), progname, name, PQdb(conn), PQerrorMessage(conn)); - if (strcmp(type, "INDEX") == 0) + else if (strcmp(type, "INDEX") == 0) fprintf(stderr, _("%s: reindexing of index \"%s\" in database \"%s\" failed: %s"), progname, name, PQdb(conn), PQerrorMessage(conn)); - if (strcmp(type, "SCHEMA") == 0) + else if (strcmp(type, "SCHEMA") == 0) fprintf(stderr, _("%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"), progname, name, PQdb(conn), PQerrorMessage(conn)); else