]> granicus.if.org Git - postgresql/commitdiff
Fix incorrect comparison due to bad merge
authorMagnus Hagander <magnus@hagander.net>
Mon, 16 Jan 2017 17:20:57 +0000 (18:20 +0100)
committerMagnus Hagander <magnus@hagander.net>
Mon, 16 Jan 2017 17:20:57 +0000 (18:20 +0100)
Noted by Fujii Masao

src/bin/pg_basebackup/pg_basebackup.c

index e7fb527d3a3d993a97679dd76c1cf09f944cd128..c5ae1cc147b7d310fb7b889f1fc7fd4e434815af 100644 (file)
@@ -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"),