Fix incorrect comparison due to bad merge

mhagander · mhagander · commit fcf708623e86 · 2017-01-16T18:20:57.000+01:00
Noted by Fujii Masao
diff --git 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"),

Original file line number	Diff line number	Diff line change
`@@ -2306,7 +2306,7 @@ main(int argc, char **argv)`
`2306`	`2306`	`exit(1);`
`2307`	`2307`	`}`
`2308`	`2308`
`2309`		`- if ((replication_slot \|\| no_slot) && includewal != STREAM_WAL)`
	`2309`	`+ if (replication_slot && includewal != STREAM_WAL)`
`2310`	`2310`	`{`
`2311`	`2311`	`fprintf(stderr,`
`2312`	`2312`	`_("%s: replication slots can only be used with WAL streaming\n"),`