aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2017-01-16 18:20:57 +0100
committerMagnus Hagander <magnus@hagander.net>2017-01-16 18:20:57 +0100
commitfcf708623e860b7a1efef11a5d5661900307b6fc (patch)
tree857b4a9f6bdbec8cfd975b7ecc3f877453855947 /src
parente7b020f786bf3b344f81d70aa423525fd4f44dfa (diff)
downloadpostgresql-fcf708623e860b7a1efef11a5d5661900307b6fc.tar.gz
postgresql-fcf708623e860b7a1efef11a5d5661900307b6fc.zip
Fix incorrect comparison due to bad merge
Noted by Fujii Masao
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_basebackup/pg_basebackup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index e7fb527d3a3..c5ae1cc147b 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -2306,7 +2306,7 @@ main(int argc, char **argv)
exit(1);
}
- if ((replication_slot || no_slot) && includewal != STREAM_WAL)
+ if (replication_slot && includewal != STREAM_WAL)
{
fprintf(stderr,
_("%s: replication slots can only be used with WAL streaming\n"),