From e16ab408f3db5ced50d84748b7a9f367ece93d3f Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Sat, 11 May 2019 13:01:07 +0900 Subject: [PATCH] Fix error reporting in reindexdb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/bin/scripts/reindexdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index be1c06ebbd..f62b7ca81c 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -307,10 +307,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