diff --git a/doc/TODO.detail/replication b/doc/TODO.detail/replication
index e98cf2f31461bc448bc7e20db2ad5c50aad482cc..a864dab5e9a69b48491f1faa1fa5c120a2f7c624 100644
--- a/doc/TODO.detail/replication
+++ b/doc/TODO.detail/replication
@@ -43,7 +43,7 @@ From owner-pgsql-hackers@hub.org Fri Dec 24 10:01:18 1999
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id LAA11295
for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 11:01:17 -0500 (EST)
-Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id KAA20310 for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 10:39:18 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id KAA20310 for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 10:39:18 -0500 (EST)
Received: from localhost (majordom@localhost)
by hub.org (8.9.3/8.9.3) with SMTP id KAA61760;
Fri, 24 Dec 1999 10:31:13 -0500 (EST)
@@ -129,7 +129,7 @@ From owner-pgsql-hackers@hub.org Fri Dec 24 18:31:03 1999
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id TAA26244
for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 19:31:02 -0500 (EST)
-Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id TAA12730 for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 19:30:05 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id TAA12730 for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 19:30:05 -0500 (EST)
Received: from localhost (majordom@localhost)
by hub.org (8.9.3/8.9.3) with SMTP id TAA57851;
Fri, 24 Dec 1999 19:23:31 -0500 (EST)
@@ -212,7 +212,7 @@ From owner-pgsql-hackers@hub.org Fri Dec 24 21:31:10 1999
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id WAA02578
for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 22:31:09 -0500 (EST)
-Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id WAA16641 for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 22:18:56 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id WAA16641 for <pgman@candle.pha.pa.us>; Fri, 24 Dec 1999 22:18:56 -0500 (EST)
Received: from localhost (majordom@localhost)
by hub.org (8.9.3/8.9.3) with SMTP id WAA89135;
Fri, 24 Dec 1999 22:11:12 -0500 (EST)
@@ -486,7 +486,7 @@ From owner-pgsql-hackers@hub.org Sun Dec 26 08:31:09 1999
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id JAA17976
for <pgman@candle.pha.pa.us>; Sun, 26 Dec 1999 09:31:07 -0500 (EST)
-Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id JAA23337 for <pgman@candle.pha.pa.us>; Sun, 26 Dec 1999 09:28:36 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id JAA23337 for <pgman@candle.pha.pa.us>; Sun, 26 Dec 1999 09:28:36 -0500 (EST)
Received: from localhost (majordom@localhost)
by hub.org (8.9.3/8.9.3) with SMTP id JAA90738;
Sun, 26 Dec 1999 09:21:58 -0500 (EST)
@@ -909,7 +909,7 @@ From owner-pgsql-hackers@hub.org Thu Dec 30 08:01:09 1999
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id JAA10317
for <pgman@candle.pha.pa.us>; Thu, 30 Dec 1999 09:01:08 -0500 (EST)
-Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id IAA02365 for <pgman@candle.pha.pa.us>; Thu, 30 Dec 1999 08:37:10 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id IAA02365 for <pgman@candle.pha.pa.us>; Thu, 30 Dec 1999 08:37:10 -0500 (EST)
Received: from localhost (majordom@localhost)
by hub.org (8.9.3/8.9.3) with SMTP id IAA87902;
Thu, 30 Dec 1999 08:34:22 -0500 (EST)
@@ -1006,7 +1006,7 @@ From owner-pgsql-patches@hub.org Sun Jan 2 23:01:38 2000
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id AAA16274
for <pgman@candle.pha.pa.us>; Mon, 3 Jan 2000 00:01:28 -0500 (EST)
-Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id XAA02655 for <pgman@candle.pha.pa.us>; Sun, 2 Jan 2000 23:45:55 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id XAA02655 for <pgman@candle.pha.pa.us>; Sun, 2 Jan 2000 23:45:55 -0500 (EST)
Received: from hub.org (hub.org [216.126.84.1])
by hub.org (8.9.3/8.9.3) with ESMTP id XAA13828;
Sun, 2 Jan 2000 23:40:47 -0500 (EST)
@@ -1424,7 +1424,7 @@ From owner-pgsql-hackers@hub.org Tue Jan 4 10:31:01 2000
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id LAA17522
for <pgman@candle.pha.pa.us>; Tue, 4 Jan 2000 11:31:00 -0500 (EST)
-Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id LAA01541 for <pgman@candle.pha.pa.us>; Tue, 4 Jan 2000 11:27:30 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id LAA01541 for <pgman@candle.pha.pa.us>; Tue, 4 Jan 2000 11:27:30 -0500 (EST)
Received: from localhost (majordom@localhost)
by hub.org (8.9.3/8.9.3) with SMTP id LAA09992;
Tue, 4 Jan 2000 11:18:07 -0500 (EST)
@@ -1558,3 +1558,62 @@ Sorry, I not sure if I re-draw previous picture total good..
************
+From pgsql-hackers-owner+M3133@hub.org Fri Jun 9 15:02:25 2000
+Received: from hub.org (root@hub.org [216.126.84.1])
+ by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id PAA22319
+ for <pgman@candle.pha.pa.us>; Fri, 9 Jun 2000 15:02:24 -0400 (EDT)
+Received: from hub.org (majordom@localhost [127.0.0.1])
+ by hub.org (8.10.1/8.10.1) with SMTP id e59IsET81137;
+ Fri, 9 Jun 2000 14:54:14 -0400 (EDT)
+Received: from ultra2.quiknet.com (ultra2.quiknet.com [207.183.249.4])
+ by hub.org (8.10.1/8.10.1) with SMTP id e59IrQT80458
+ for <pgsql-hackers@postgresql.org>; Fri, 9 Jun 2000 14:53:26 -0400 (EDT)
+Received: (qmail 13302 invoked from network); 9 Jun 2000 18:53:21 -0000
+Received: from 18.67.tc1.oro.pmpool.quiknet.com (HELO quiknet.com) (pecondon@207.231.67.18)
+ by ultra2.quiknet.com with SMTP; 9 Jun 2000 18:53:21 -0000
+Message-ID: <39413D08.A6BDC664@quiknet.com>
+Date: Fri, 09 Jun 2000 11:52:57 -0700
+From: Paul Condon <pecondon@quiknet.com>
+X-Mailer: Mozilla 4.73 [en] (X11; U; Linux 2.2.14-5.0 i686)
+X-Accept-Language: en
+MIME-Version: 1.0
+To: ohp@pyrenet.fr, pgsql-hackers@postgresql.org
+Subject: [HACKERS] Re: Big project, please help
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+X-Mailing-List: pgsql-hackers@postgresql.org
+Precedence: bulk
+Sender: pgsql-hackers-owner@hub.org
+Status: OR
+
+Two way replication on a single "table" is availabe in Lotus Notes. In
+Notes, every record has a time-stamp, which contains the time of the
+last update. (It also has a creation timestamp.) During replication,
+timestamps are compared at the row/record level, and compared with the
+timestamp of the last replication. If, for corresponding rows in two
+replicas, the timestamp of one row is newer than the last replication,
+the contents of this newer row is copied to the other replica. But if
+both of the corresponding rows have newer timestamps, there is a
+problem. The Lotus Notes solution is to:
+ 1. send a replication conflict message to the Notes Administrator,
+which message contains full copies of both rows.
+ 2. copy the newest row over the less new row in the replicas.
+ 3. there is a mechanism for the Administrator to reverse the default
+decision in 2, if the semantics of the message history, or off-line
+investigation indicates that the wrong decision was made.
+
+In practice, the Administrator is not overwhelmed with replication
+conflict messages because updates usually only originate at the site
+that originally created the row. Or updates fill only fields that were
+originally 'TBD'. The full logic is perhaps more complicated than I have
+described here, but it is already complicated enough to give you an idea
+of what you're really being asked to do. I am not aware of a supplier of
+relational database who really supports two way replication at the level
+that Notes supports it, but Notes isn't a relational database.
+
+The difficulty of the position that you appear to be in is that
+management might believe that the full problem is solved in brand X
+RDBMS, and you will have trouble convincing management that this is not
+really true.
+
+
diff --git a/doc/TODO.detail/tablespaces b/doc/TODO.detail/tablespaces
index 7eb866c3115578ecbee437c8eacd9f9fdfbb39e9..dbff4e49757dbe74553a18ef1c440ea3fb143702 100644
--- a/doc/TODO.detail/tablespaces
+++ b/doc/TODO.detail/tablespaces
@@ -2,7 +2,7 @@ From pgsql-hackers-owner+M174@hub.org Sun Mar 12 22:31:11 2000
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id XAA25886
for <pgman@candle.pha.pa.us>; Sun, 12 Mar 2000 23:31:10 -0500 (EST)
-Received: from news.tht.net (news.hub.org [216.126.91.242]) by renoir.op.net (o1/$Revision: 1.1 $) with ESMTP id XAA04589 for <pgman@candle.pha.pa.us>; Sun, 12 Mar 2000 23:19:33 -0500 (EST)
+Received: from news.tht.net (news.hub.org [216.126.91.242]) by renoir.op.net (o1/$Revision: 1.2 $) with ESMTP id XAA04589 for <pgman@candle.pha.pa.us>; Sun, 12 Mar 2000 23:19:33 -0500 (EST)
Received: from hub.org (hub.org [216.126.84.1])
by news.tht.net (8.9.3/8.9.3) with SMTP id XAA42854;
Sun, 12 Mar 2000 23:05:05 -0500 (EST)
@@ -480,7 +480,7 @@ From Inoue@tpf.co.jp Wed Mar 15 02:00:58 2000
Received: from renoir.op.net (root@renoir.op.net [207.29.195.4])
by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id DAA17887
for <pgman@candle.pha.pa.us>; Wed, 15 Mar 2000 03:00:57 -0500 (EST)
-Received: from sd.tpf.co.jp (sd.tpf.co.jp [210.161.239.34]) by renoir.op.net (o1/$Revision: 1.1 $) with ESMTP id CAA02974 for <pgman@candle.pha.pa.us>; Wed, 15 Mar 2000 02:54:44 -0500 (EST)
+Received: from sd.tpf.co.jp (sd.tpf.co.jp [210.161.239.34]) by renoir.op.net (o1/$Revision: 1.2 $) with ESMTP id CAA02974 for <pgman@candle.pha.pa.us>; Wed, 15 Mar 2000 02:54:44 -0500 (EST)
Received: from cadzone ([126.0.1.40] (may be forged))
by sd.tpf.co.jp (2.5 Build 2640 (Berkeley 8.8.6)/8.8.4) with SMTP
id QAA00734; Wed, 15 Mar 2000 16:53:56 +0900
@@ -539,3 +539,203 @@ Hiroshi Inoue
Inoue@tpf.co.jp
+From pgsql-hackers-owner+M196@hub.org Thu Mar 16 03:02:35 2000
+Received: from hub.org (hub.org [216.126.84.1])
+ by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id EAA05789
+ for <pgman@candle.pha.pa.us>; Thu, 16 Mar 2000 04:02:29 -0500 (EST)
+Received: from hub.org (hub.org [216.126.84.1])
+ by hub.org (8.9.3/8.9.3) with SMTP id CAA27302;
+ Thu, 16 Mar 2000 02:58:55 -0500 (EST)
+ (envelope-from pgsql-hackers-owner+M196@hub.org)
+Received: from downtown.oche.de (root@downtown.oche.de [194.94.253.3])
+ by hub.org (8.9.3/8.9.3) with ESMTP id CAA23907
+ for <pgsql-hackers@postgresql.org>; Thu, 16 Mar 2000 02:37:54 -0500 (EST)
+ (envelope-from mne@darwin.oche.de)
+Received: from darwin.oche.de (uucp@localhost)
+ by downtown.oche.de (8.9.3/8.9.3/Debian/GNU) with SMTP id IAA30654
+ for <pgsql-hackers@postgresql.org>; Thu, 16 Mar 2000 08:40:04 +0100
+Received: from mne by darwin.oche.de with local (Exim 3.12 #1 (Debian))
+ id 12VUhX-0003Vz-00
+ for <pgsql-hackers@postgreSQL.org>; Thu, 16 Mar 2000 08:28:11 +0100
+Date: Thu, 16 Mar 2000 08:28:11 +0100 (CET)
+From: Martin Neumann <mne@mne.de>
+Subject: [HACKERS] RfD: Design of tablespaces
+To: pgsql-hackers@postgresql.org
+MIME-Version: 1.0
+Content-Type: TEXT/plain; CHARSET=US-ASCII
+Message-Id: <E12VUhX-0003Vz-00@darwin.oche.de>
+Precedence: bulk
+Sender: pgsql-hackers-owner@hub.org
+Status: OR
+
+
+I have written some thoughts on the concept of tablespace
+down. I would be happy to get some comments on it.
+
+-----------------------------------------------------------------
+ Implementation of tablespaces within PostgreSQL
+- a brainstorming paper designed for general discussion -
+
+by Martin Neumann, 2000/3/15
+
+
+1. What are tablespaces?
+-------------------------
+
+Tablespaces make it possible to distribute storage objects
+over multiple points of storage (POS). Therefor one could
+say a tablespace can be a POS.
+
+Example:
+
+tablespace_a -----> /mnt/raid/arena0/
+tablespace_b -----> /mnt/raid/emc0/
+
+Tablespaces can also store their data on other tablespaces:
+
+tablespace_c -----> tablespace_b
+
+This is quite interessting for administration purposes.
+
+
+2. What are its advantages?
+----------------------------
+
+As you can choose a different tablespace for every storage
+object (table, index etc.) it is easy to improve the following
+aspects of your system:
+
+ - Reliability
+
+ You can put storage objects (mostly tables) you strongly depend
+ on onto a more reliable tablespace (mirrored RAID or perhaps
+ simply a directory which gets backuped more often than others).
+
+ - Speed
+
+ You can put storage objects you rarely need onto a rather slow
+ tablespace and keep your quick tablespaces clean from this.
+
+ A fast, but more expensive RAID-Stripeset can be used more
+ efficiently as it doesn't get filled with non-performance
+ sensitive data.
+
+ But also distributing storage objects which have equal needs
+ in sense of speed onto different tablespaces makes sense as
+ you gain more speed by distributing data over more than one
+ harddisk spindle.
+
+ - Manageability
+
+ You can grant and revoke rights on base of a tablespace.
+
+ As every storage object belongs to exactly one tablespace,
+ you can easily group storage objects using a tablespace.
+
+
+3. What about disk I/O?
+------------------------
+
+Tablespaces tell the storage manager only where to store
+the data, not how. This is the reasonable way.
+
+
+4. Usage
+---------
+
+CREATE TABLESPACE tsname TYPE storage_type storage_options
+
+Examples:
+
+CREATE TABLESPACE tsemc0
+ TYPE classic DIRECTORY /mnt/raid/emc0 NOFSYNC
+
+CREATE TABLESPACE tsarena0 TYPE raw DEVICE /dev/araid/0
+ MINSIZE 128 MAXSIZE 4096 GROW 4 32 SHRINK 2 32
+ BLOCKSIZE 16384
+
+CREATE TABLESPACE quick0 TYPE link TABLESPACE tsarena0;
+
+--
+
+CREATE TABLE tbname ( ... ) TABLESPACE tsname;
+
+Examples:
+
+CREATE TABLE foo (
+ id int4 NOT NULL UNIQUE,
+ name text NOT NULL
+) TABLESPACE tsemc0;
+
+CREATE TABLE bar (
+ id int4 NOT NULL UNIQUE,
+ name text NOT NULL
+) TABLESPACE default;
+
+If the tablespace isn't given, the storage objects gets created
+in the "default" tablespace.
+
+"default" is the PostgreSQL's default tablespace and the only one
+which has to exist on each system.
+
+--
+
+ALTER TABLESPACE tsname tssettings
+
+Examples:
+
+ALTER TABLESPACE tsemc0 DIRECTORY /mnt/raid/emc1
+
+
+NOTE: altering tablespaces without recreating the contained
+storage objects introduces many problems.
+Realisation is difficult and won't be my first goal.
+
+--
+
+DROP TABLESPACE tsname [FORCE]
+
+Examples:
+
+DROP TABLESPACE tsarena0
+
+This will immediately remove the tablespace tsarena0
+if it contains no storage objects.
+
+If it still contains some the tablespace is marked for
+deletion.
+
+This means:
+1. you can't create new storage objects in the tablespace
+2. if the last storage object inside gets dropped, the
+ tablespace will be removed.
+
+
+DROP TABLESPACE tsarena0 FORCE
+
+This will remove the tablespace including all contained
+storage objects immediately.
+
+--
+
+VACUUM tsname
+
+Example:
+
+VACUUM tsemc1
+
+This will vacuum a single tablespace with all contained
+storage objects.
+-----------------------------------------------------------------
+
+--
+Martin Neumann, Welkenrather Str. 118c, 52074 Aachen, Germany
+mne@mne.de - http://www.mne.de/mne/ - sms@mne.de [eMail2SMS]
+Tel. 0241 / 8876-080 - Mobil: 0173 / 27 69 632
+..------.---------------------------------------------------------
+| at | Inform GmbH - Abteilung Airport Logistics
+| work | Pascalstr. 23 - 52076 Aachen - Tel. 02408 / 9456-0
+|______| martin.neumann@inform-ac.com - http://www.inform-ac.com
+
+
+
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index f40a259075b62a88201feef072efbff43ce97791..319b2926a72580968ee5b1b2439d3fb1beca5886 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -26,7 +26,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.94 2000/06/09 15:50:49 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.95 2000/06/09 23:50:24 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -523,7 +523,7 @@ echo "CREATE VIEW pg_user AS \
usename, \
usesysid, \
usecreatedb, \
- usecreatetable, \
+ usecreatetable, \
uselocktable, \
usetrace, \
usesuper, \