git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml

index 8633875006c46a18b451641b5964eab6c5574946..11fa5fbe601e47a64f5ab810e3e9fdb7167fa876 100644 (file)

--- a/doc/src/sgml/ref/pg_dump.sgml

+++ b/doc/src/sgml/ref/pg_dump.sgml

<!--

-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.111 2009年02月26日 16:02:37 petere Exp $

+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.112 2009年03月04日 11:57:00 petere Exp $

PostgreSQL documentation

-->

</listitem>

</varlistentry>

+ <varlistentry>

+ <term><option>--binary-upgrade</option></term>

+ <listitem>

+ <para>

+ This option is for use by in-place upgrade utilities. Its use

+ for other purposes is not recommended or supported. The

+ behavior of the option may change in future releases without

+ notice.

+ </para>

+ </listitem>

+ </varlistentry>

+

<varlistentry>

<term><option>--disable-dollar-quoting</></term>

<listitem>

that can be loaded into older database versions. To do this, manual

editing of the dump file might be required.

</para>

-

- <para>

- <application>pg_dump</application> also supports a

- <literal>--binary-upgrade</> option for upgrade utility usage.

- </para>

-

</refsect1>

<refsect1 id="pg-dump-examples">

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml

index 0a8e7ef8c4114433815b47af8240207042f795f6..6a91c05e7803054e3028e6b891915c0ee8b56541 100644 (file)

--- a/doc/src/sgml/ref/pg_dumpall.sgml

+++ b/doc/src/sgml/ref/pg_dumpall.sgml

<!--

-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.77 2009年02月26日 16:02:37 petere Exp $

+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.78 2009年03月04日 11:57:00 petere Exp $

PostgreSQL documentation

-->

</listitem>

</varlistentry>

+ <varlistentry>

+ <term><option>--binary-upgrade</option></term>

+ <listitem>

+ <para>

+ This option is for use by in-place upgrade utilities. Its use

+ for other purposes is not recommended or supported. The

+ behavior of the option may change in future releases without

+ notice.

+ </para>

+ </listitem>

+ </varlistentry>

+

<varlistentry>

<term><option>--disable-dollar-quoting</></term>

<listitem>

database creation will fail for databases in non-default

locations.

</para>

-

- <para>

- <application>pg_dump</application> also supports a

- <literal>--binary-upgrade</> option for upgrade utility usage.

- </para>

-

</refsect1>

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c

index 26e1c044cb76e2df7f6ca1873c9da36082c88b69..d7a96d5b11bd2aa287408b08c1cd35e0e258dec2 100644 (file)

--- a/src/bin/pg_dump/pg_dump.c

+++ b/src/bin/pg_dump/pg_dump.c

* by PostgreSQL

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.527 2009年02月26日 16:02:38 petere Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.528 2009年03月04日 11:57:00 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" -t, --table=TABLE dump the named table(s) only\n"));

printf(_(" -T, --exclude-table=TABLE do NOT dump the named table(s)\n"));

printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));

+ printf(_(" --binary-upgrade for use by upgrade utilities only\n"));

printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));

printf(_(" --disable-triggers disable triggers during data-only restore\n"));

printf(_(" --no-tablespaces do not dump tablespace assignments\n"));

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c

index 2ddc03873e50b81c84e155e0d7d5cb51161cfb16..b455051e27097a840e3dcdcb8d9b27833a718d6d 100644 (file)

--- a/src/bin/pg_dump/pg_dumpall.c

+++ b/src/bin/pg_dump/pg_dumpall.c

* Portions Copyright (c) 1994, Regents of the University of California

*

*

- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.118 2009年02月26日 16:02:38 petere Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.119 2009年03月04日 11:57:00 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" -S, --superuser=NAME superuser user name to use in the dump\n"));

printf(_(" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"));

printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));

+ printf(_(" --binary-upgrade for use by upgrade utilities only\n"));

printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));

printf(_(" --disable-triggers disable triggers during data-only restore\n"));

printf(_(" --no-tablespaces do not dump tablespace assignments\n"));