summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas2017-07-21 16:48:22 +0000
committerRobert Haas2017-07-21 16:59:22 +0000
commit063ff9210c54928a2d19f9e826486621809e1b82 (patch)
treed92cffe43f25a93a37c404bb8437cf63dc3346d4
parent8bf58c0d9bd336868e2d6489f11dc094cad9ad91 (diff)
pg_rewind: Fix busted sanity check.
As written, the code would only fail the sanity check if none of the columns returned by the server were of the expected type, but we want it to fail if even one column is not of the expected type. Discussion: http://postgr.es/m/CA+TgmoYuY5zW7JEs+1hSS1D=V5K8h1SQuESrq=bMNeo0B71Sfw@mail.gmail.com
-rw-r--r--src/bin/pg_rewind/libpq_fetch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index c25367fc49..cf3f64c3aa 100644
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -269,8 +269,8 @@ receiveFileChunks(const char *sql)
if (PQnfields(res) != 3 || PQntuples(res) != 1)
pg_fatal("unexpected result set size while fetching remote files\n");
- if (PQftype(res, 0) != TEXTOID &&
- PQftype(res, 1) != INT4OID &&
+ if (PQftype(res, 0) != TEXTOID ||
+ PQftype(res, 1) != INT4OID ||
PQftype(res, 2) != BYTEAOID)
{
pg_fatal("unexpected data types in result set while fetching remote files: %u %u %u\n",