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
This commit is contained in:
Andres Freund 2014-08-12 11:12:16 +02:00
parent 423f73df9d
commit 876f1e6805

View File

@ -814,15 +814,15 @@ main(int argc, char **argv)
if (do_drop_slot && (do_create_slot || do_start_slot)) 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"), fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname); progname);
exit(1); 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"), fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname); progname);
exit(1); exit(1);