diff --git a/doc/TODO b/doc/TODO
index 79748393528..83683348334 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
-Last updated: Wed Nov 16 11:33:25 EST 2005
+Last updated: Wed Nov 16 13:44:51 EST 2005
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -373,7 +373,9 @@ SQL Commands
triggers?)
To implement this cleanly requires that the table have a unique index
- so duplicate checking can be easily performed.
+ so duplicate checking can be easily performed. It is possible to
+ do it without a unique index if we require the user to LOCK the table
+ before the MERGE.
* Add NOVICE output level for helpful messages like automatic sequence/index
creation
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index fe0ad23c056..a3d1050c162 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
-Last updated: Wed Nov 16 11:33:25 EST 2005
+Last updated: Wed Nov 16 13:44:51 EST 2005
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -342,7 +342,9 @@ first.
Add MERGE command that does UPDATE/DELETE, or on failure, INSERT (rules,
triggers?)
To implement this cleanly requires that the table have a unique index
- so duplicate checking can be easily performed.
+ so duplicate checking can be easily performed. It is possible to
+ do it without a unique index if we require the user to LOCK the table
+ before the MERGE.
Add NOVICE output level for helpful messages like automatic sequence/index
creation