Provide some proper minimal documentation for the pg_dump(all) --binary-upgrade

option.  We don't want to commit to what it does, but hiding it will only
cause confusion.

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
@@ -1,5 +1,5 @@
 
 
@@ -550,6 +550,18 @@ PostgreSQL documentation
       
      
 
+     
+      --binary-upgrade
+      
+       
+        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.
+       
+      
+     
+
      
       --disable-dollar-quoting
       
@@ -841,12 +853,6 @@ CREATE DATABASE foo WITH TEMPLATE template0;
    that can be loaded into older database versions.  To do this, manual
    editing of the dump file might be required.
   
-
-  
-   pg_dump also supports a
-   --binary-upgrade option for upgrade utility usage.
-  
-
  
 
  

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
@@ -1,5 +1,5 @@
 
 
@@ -290,6 +290,18 @@ PostgreSQL documentation
       
      
 
+     
+      --binary-upgrade
+      
+       
+        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.
+       
+      
+     
+
      
       --disable-dollar-quoting
       
@@ -503,12 +515,6 @@ PostgreSQL documentation
    database creation will fail for databases in non-default
    locations.
   
-
-  
-   pg_dump also supports a
-   --binary-upgrade option for upgrade utility usage.
-  
-
  
 
 

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
@@ -12,7 +12,7 @@
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -828,6 +828,7 @@ help(const char *progname)
    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
@@ -6,7 +6,7 @@
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -521,6 +521,7 @@ help(void)
    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"));