aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFujii Masao <fujii@postgresql.org>2014-08-13 10:42:16 +0900
committerFujii Masao <fujii@postgresql.org>2014-08-13 10:42:16 +0900
commit52bffe3499d8e5f61efa385ab3c6a074314ee5db (patch)
tree133bc8dcda134cd9fa44bbbe7abe4b7ea48133f5
parent596385be06e1c8ac7291958a556b10b37ee333d5 (diff)
downloadpostgresql-52bffe3499d8e5f61efa385ab3c6a074314ee5db.tar.gz
postgresql-52bffe3499d8e5f61efa385ab3c6a074314ee5db.zip
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
-rw-r--r--doc/src/sgml/ref/pg_receivexlog.sgml1
-rw-r--r--src/bin/pg_basebackup/pg_receivexlog.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/sgml/ref/pg_receivexlog.sgml b/doc/src/sgml/ref/pg_receivexlog.sgml
index c15776fc585..5916b8f40da 100644
--- 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 0b7af54a7ba..a8b9ad3c05f 100644
--- 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 <pgsql-bugs@postgresql.org>.\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)