pg_recvlogical message and code improvements.

Some error messages complained about --init and --stop being used
whereas the --create and --drop are the correct verbs. Fix that.

Also a XLogRecPtr was tested in a boolean fashion instead of being
compared to InvalidXLogRecPtr.

Backpatch to 9.4 where pg_recvlogical was introduced.

Michael Paquier

diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index dbc002d18e04768d38d33cda0d1e86fc9314146f..f3b0f34fce9d98c31f04a30615b40dd9b88835b2 100644 (file)
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -814,15 +814,15 @@ main(int argc, char **argv)
 
        if (do_drop_slot && (do_create_slot || do_start_slot))
        {
-               fprintf(stderr, _("%s: cannot use --init or --start together with --stop\n"), progname);
+               fprintf(stderr, _("%s: cannot use --create or --start together with --drop\n"), progname);
                fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                                progname);
                exit(1);
        }
 
-       if (startpos && (do_create_slot || do_drop_slot))
+       if (startpos != InvalidXLogRecPtr && (do_create_slot || do_drop_slot))
        {
-               fprintf(stderr, _("%s: cannot use --init or --stop together with --startpos\n"), progname);
+               fprintf(stderr, _("%s: cannot use --create or --drop together with --startpos\n"), progname);
                fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                                progname);
                exit(1);