On 2021-Jan-20, Robert Haas wrote:
> On Wed, Jan 20, 2021 at 1:54 PM Tom Lane <[email protected]> wrote:
> > Alvaro Herrera <[email protected]> writes:
> > > Well, the patch seems small enough, and I don't think it'll be in any
> > > way helpful to omit that detail.
> >
> > I'm +1 for applying and back-patching that. I still think we might
> > want to just drop the phrase altogether in HEAD, but we wouldn't do
> > that in the back branches, and the message is surely misleading as-is.
>
> Sure, that makes sense.
OK, I pushed it. Thanks,
pgbench has one occurrence of the old pattern in master, in line 6043.
However, since doConnect() returns NULL when it gets CONNECTION_BAD,
that seems dead code. This patch kills it.
--
Álvaro Herrera 39°49'30"S 73°17'W
"I can see support will not be a problem. 10 out of 10." (Simon Wittber)
(http://archives.postgresql.org/pgsql-general/2004-12/msg00159.php)
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 1be1ad3d6d..a4a3f40048 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -6038,17 +6038,10 @@ main(int argc, char **argv)
/* opening connection... */
con = doConnect();
if (con == NULL)
exit(1);
- if (PQstatus(con) == CONNECTION_BAD)
- {
- pg_log_fatal("connection to database \"%s\" failed: %s",
- dbName, PQerrorMessage(con));
- exit(1);
- }
-
if (internal_script_used)
GetTableInfo(con, scale_given);
/*
* :scale variables normally get -s or database scale, but don't override