postgres.git / summary / log / commit / refs

commit    fcf708623e860b7a1efef11a5d5661900307b6fc
Author:   Magnus Hagander <magnus@hagander.net>
Date:     Mon Jan 16 17:20:57 2017 +0000
First released in: 10.0

    Fix incorrect comparison due to bad merge
    
    Noted by Fujii Masao


 src/bin/pg_basebackup/pg_basebackup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"),


[parent: e7b020f786bf]