Move pg_controldata to /bin.

contrib/pg_resetxlog/Makefile

-# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.6 2002/07/27 20:10:03 petere Exp $
-
-subdir = contrib/pg_resetxlog
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-all: submake-libpgport
-
-PROGRAM = pg_resetxlog
-OBJS	= pg_resetxlog.o pg_crc.o
-
-pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
-	rm -f $@ && $(LN_S) $< .
-
-EXTRA_CLEAN = pg_crc.c
-
-DOCS = README.pg_resetxlog
-
-include $(top_srcdir)/contrib/contrib-global.mk

contrib/pg_resetxlog/README.pg_resetxlog

-pg_resetxlog is a program to clear the WAL transaction log (stored in
-$PGDATA/pg_xlog/), replacing whatever had been in it with just a dummy
-shutdown-checkpoint record.  It also regenerates the pg_control file
-if necessary.
-
-THIS PROGRAM WILL DESTROY VALUABLE LOG DATA!!!  Don't run it unless you
-really need it!!!
-
-pg_resetxlog is primarily intended for disaster recovery --- that is,
-if your pg_control and/or xlog are hosed badly enough that Postgres refuses
-to start up, this program will get you past that problem and let you get to
-your data files.  But realize that without the xlog, your data files may be
-corrupt due to partially-applied transactions, incomplete index-file
-updates, etc.  You should dump your data, check it for accuracy, then initdb
-and reload.
-
-A secondary purpose is to cope with xlog format changes without requiring
-initdb.  To use pg_resetxlog for this purpose, just be sure that you have
-cleanly shut down your old postmaster (if you're not sure, see the contrib
-module pg_controldata and run it to be sure the DB state is SHUTDOWN).
-Then run pg_resetxlog, and finally install and start the new version of
-the database software.
-
-A tertiary purpose is its use by pg_upgrade to set the next transaction
-id and checkpoint location in pg_control.
-
-To run the program, make sure your postmaster is not running, then
-(as the Postgres admin user) do
-
-	pg_resetxlog $PGDATA
-
-As a safety measure, the target data directory must be specified on the
-command line, it cannot be defaulted.
-
-If pg_resetxlog complains that it can't reconstruct valid data for pg_control,
-you can force it to invent plausible data values with
-
-	pg_resetxlog -f $PGDATA
-
-If this turns out to be necessary then you *definitely* should plan on
-immediate dump, initdb, reload --- any modifications you do to the database
-after "pg_resetxlog -f" would be likely to corrupt things even worse.

doc/src/sgml/ref/pg_controldata.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_controldata.sgml,v 1.2 2002/08/16 20:36:25 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_controldata.sgml,v 1.3 2002/08/17 02:43:08 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -33,7 +33,8 @@ PostgreSQL documentation
   </para>
 
   <para>
-   This utility may only be run by the user who installed the server.
+   This utility may only be run by the user who installed the server because
+   it requires read access to the <literal>datadir</>.
    You can specify the data directory on the command line, or use 
    the environment variable <envar>PGDATA</>.
   </para>

src/bin/pg_controldata/Makefile

@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998, PostgreSQL Global Development Group
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/Makefile,v 1.1 2002/08/16 20:34:06 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/Makefile,v 1.2 2002/08/17 02:43:08 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ OBJS= pg_controldata.o pg_crc.o
 pg_crc.c: $(top_builddir)/src/backend/utils/hash/pg_crc.c
 	rm -f $@ && $(LN_S) $< .
 
-all: submake-libpq submake-libpgport pg_controldata
+all: submake-libpgport pg_controldata
 
 pg_controldata: $(OBJS)
 	$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@