CVSROOT:	/cvsroot
Module name:	pgsql-server
Changes by:	momjian(at)svr1(dot)postgresql(dot)org	04/05/11 10:44:05

Modified files:
	doc            : TODO 

Log message:
	Add mention of rules/triggers:
	
	> * Add MERGE command that does UPDATE, or on failure, INSERT (rules, triggers?)

pgsql-committers by date

Next:	From: Tom Lane	Date: 2004-05-11 17:36:14
	Subject: pgsql-server/src backend/catalog/aclchk.c back ...
Previous:	From: Tom Lane	Date: 2004-05-11 13:15:24
	Subject: pgsql-server/src/backend/optimizer/plan Tag: R ...