summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFujii Masao2014-08-13 01:45:28 +0000
committerFujii Masao2014-08-13 01:45:28 +0000
commit7c77ba8577d52b142997303f14c1e01abdb2d104 (patch)
tree37d297fb4f8074e3b6329f33a13d6df6ad5c249d
parent876f1e6805c34bb87525583e524e3445a33c215b (diff)
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 7c50b01a57b..b792aa54402 100644
--- a/doc/src/sgml/ref/pg_receivexlog.sgml
+++ b/doc/src/sgml/ref/pg_receivexlog.sgml
@@ -227,6 +227,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 96408389062..ba635f2b86f 100644
--- a/src/bin/pg_basebackup/pg_receivexlog.c
+++ b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -74,7 +74,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"));
}
@@ -389,7 +389,7 @@ main(int argc, char **argv)
}
}
- while ((c = getopt_long(argc, argv, "D:d:h:p:U:s:nwWv",
+ while ((c = getopt_long(argc, argv, "D:d:h:p:U:s:S:nwWv",
long_options, &option_index)) != -1)
{
switch (c)