Expose -S option in pg_receivexlog.

This option is equivalent to --slot option which pg_receivexlog has
already supported, which specifies the replication slot to use for
WAL streaming. pg_recvlogical has already supported both options,
and this commit makes pg_receivexlog consistent with pg_recvlogical
regarding the slot option.

Back-patch to 9.4 where the slot option was added.

Michael Paquier

diff --git a/doc/src/sgml/ref/pg_receivexlog.sgml b/doc/src/sgml/ref/pg_receivexlog.sgml
index c15776fc5852824d3550c79e7dd5e8fec9c9d104..5916b8f40dacf291e7c4848eb1853a1464c8a535 100644 (file)
--- a/doc/src/sgml/ref/pg_receivexlog.sgml
+++ b/doc/src/sgml/ref/pg_receivexlog.sgml
@@ -242,6 +242,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
+      <term><option>-S <replaceable>slotname</replaceable></option></term>
       <term><option>--slot=<replaceable class="parameter">slotname</replaceable></option></term>
       <listitem>
         <para>

diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
index 0b7af54a7baff7fa935ac1e0c03d3a8946d59a46..a8b9ad3c05fe71935da0c3f1cd4c45c3dafbfeed 100644 (file)
--- a/src/bin/pg_basebackup/pg_receivexlog.c
+++ b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -77,7 +77,7 @@ usage(void)
    printf(_("  -U, --username=NAME    connect as specified database user\n"));
    printf(_("  -w, --no-password      never prompt for password\n"));
    printf(_("  -W, --password         force password prompt (should happen automatically)\n"));
-   printf(_("      --slot=SLOTNAME    replication slot to use\n"));
+   printf(_("  -S, --slot=SLOTNAME    replication slot to use\n"));
    printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
@@ -394,7 +394,7 @@ main(int argc, char **argv)
        }
    }
 
-   while ((c = getopt_long(argc, argv, "D:d:h:p:U:s:nF:wWv",
+   while ((c = getopt_long(argc, argv, "D:d:h:p:U:s:S:nF:wWv",
                            long_options, &option_index)) != -1)
    {
        switch (c)