Index: contrib/dblink/dblink.c
===================================================================
RCS file: /opt/src/cvs/pgsql-server/contrib/dblink/dblink.c,v
retrieving revision 1.29
diff -c -r1.29 dblink.c
*** contrib/dblink/dblink.c	28 Nov 2003 05:03:01 -0000	1.29
--- contrib/dblink/dblink.c	5 Feb 2004 19:49:00 -0000
***************
*** 135,140 ****
--- 135,150 ----
  					 errmsg("%s", p2), \
  					 errdetail("%s", msg))); \
  	} while (0)
+ #define DBLINK_RES_ERROR_AS_NOTICE(p2) \
+ 	do { \
+ 			msg = pstrdup(PQerrorMessage(conn)); \
+ 			if (res) \
+ 				PQclear(res); \
+ 			ereport(NOTICE, \
+ 					(errcode(ERRCODE_SYNTAX_ERROR), \
+ 					 errmsg("%s", p2), \
+ 					 errdetail("%s", msg))); \
+ 	} while (0)
  #define DBLINK_CONN_NOT_AVAIL \
  	do { \
  		if(conname) \
***************
*** 731,739 ****
  	if (!res ||
  		(PQresultStatus(res) != PGRES_COMMAND_OK &&
  		 PQresultStatus(res) != PGRES_TUPLES_OK))
! 		DBLINK_RES_ERROR("sql error");
  
! 	if (PQresultStatus(res) == PGRES_COMMAND_OK)
  	{
  		/* need a tuple descriptor representing one TEXT column */
  		tupdesc = CreateTemplateTupleDesc(1, false);
--- 741,762 ----
  	if (!res ||
  		(PQresultStatus(res) != PGRES_COMMAND_OK &&
  		 PQresultStatus(res) != PGRES_TUPLES_OK))
! 	{
! 		DBLINK_RES_ERROR_AS_NOTICE("sql error");
! 
! 		/* need a tuple descriptor representing one TEXT column */
! 		tupdesc = CreateTemplateTupleDesc(1, false);
! 		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
! 						   TEXTOID, -1, 0, false);
  
! 		/*
! 		 * and save a copy of the command status string to return as our
! 		 * result tuple
! 		 */
! 		sql_cmd_status = GET_TEXT("ERROR");
! 
! 	}
! 	else if (PQresultStatus(res) == PGRES_COMMAND_OK)
  	{
  		/* need a tuple descriptor representing one TEXT column */
  		tupdesc = CreateTemplateTupleDesc(1, false);