Index: src/backend/executor/execUtils.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/executor/execUtils.c,v
retrieving revision 1.171
diff -c -c -r1.171 execUtils.c
*** src/backend/executor/execUtils.c	26 Feb 2010 02:00:41 -0000	1.171
--- src/backend/executor/execUtils.c	29 May 2010 02:30:23 -0000
***************
*** 1310,1316 ****
  
  	/*
  	 * We should have found our tuple in the index, unless we exited the loop
! 	 * early because of conflict.  Complain if not.
  	 */
  	if (!found_self && !conflict)
  		ereport(ERROR,
--- 1310,1317 ----
  
  	/*
  	 * We should have found our tuple in the index, unless we exited the loop
! 	 * early because of conflict.  Complain if not.  If we ever implement
!      * '<>' index opclasses, this check will fail and will have to be removed.
  	 */
  	if (!found_self && !conflict)
  		ereport(ERROR,