Index: doc/src/sgml/config.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/config.sgml,v
retrieving revision 1.23
diff -c -r1.23 config.sgml
*** doc/src/sgml/config.sgml	24 Sep 2005 23:25:31 -0000	1.23
--- doc/src/sgml/config.sgml	28 Sep 2005 01:03:14 -0000
***************
*** 2295,2301 ****
          Valid values are <literal>DEBUG5</>,
          <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
          <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
!         <literal>WARNING</>, and <literal>ERROR</>.  Each level
          includes all the levels that follow it.  The later the level,
          the fewer messages are sent.  The default is
          <literal>NOTICE</>.  Note that <literal>LOG</> has a different
--- 2295,2302 ----
          Valid values are <literal>DEBUG5</>,
          <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
          <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
!         <literal>WARNING</>, <literal>ERROR</>, <literal>FATAL</>,
!         and <literal>PANIC</>.  Each level
          includes all the levels that follow it.  The later the level,
          the fewer messages are sent.  The default is
          <literal>NOTICE</>.  Note that <literal>LOG</> has a different
Index: src/bin/psql/common.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/psql/common.c,v
retrieving revision 1.105
diff -c -r1.105 common.c
*** src/bin/psql/common.c	20 Sep 2005 21:43:08 -0000	1.105
--- src/bin/psql/common.c	28 Sep 2005 01:03:14 -0000
***************
*** 681,687 ****
  
  	if (!OK)
  	{
! 		psql_error("%s", PQerrorMessage(pset.db));
  		ReportSyntaxErrorPosition(result, query);
  		CheckConnection();
  	}
--- 681,690 ----
  
  	if (!OK)
  	{
! 		const char *error = PQerrorMessage(pset.db);
! 		if (strlen(error))
! 			psql_error("%s", error);
! 
  		ReportSyntaxErrorPosition(result, query);
  		CheckConnection();
  	}