From: Magnus Hagander <magnus@hagander.net>
Date: Mon, 16 Jan 2017 17:20:57 +0000 (+0100)
Subject: Fix incorrect comparison due to bad merge
X-Git-Tag: REL_10_BETA1~1109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcf708623e860b7a1efef11a5d5661900307b6fc;p=postgresql

Fix incorrect comparison due to bad merge

Noted by Fujii Masao
---

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index e7fb527d3a..c5ae1cc147 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"),