Index: src/backend/commands/copy.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/commands/copy.c,v
retrieving revision 1.218
diff -c -c -r1.218 copy.c
*** src/backend/commands/copy.c	10 Feb 2004 01:55:24 -0000	1.218
--- src/backend/commands/copy.c	6 Apr 2004 13:16:35 -0000
***************
*** 780,785 ****
--- 780,793 ----
  				 errmsg("COPY delimiter must be a single character")));
  
  	/*
+ 	 * Don't allow the delimiter to appear in the null string.
+ 	 */
+ 	if (strchr(null_print, delim[0]) != NULL)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ 				 errmsg("COPY delimiter must not appear in the NULL specification")));
+ 
+ 	/*
  	 * Don't allow COPY w/ OIDs to or from a table without them
  	 */
  	if (oids && !rel->rd_rel->relhasoids)