Index: src/backend/utils/error/elog.c
===================================================================
RCS file: /repositories/postgreshome/cvs/pgsql/src/backend/utils/error/elog.c,v
retrieving revision 1.226
diff -c -p -r1.226 elog.c
*** src/backend/utils/error/elog.c	19 Aug 2010 22:55:01 -0000	1.226
--- src/backend/utils/error/elog.c	1 Apr 2011 15:47:01 -0000
*************** write_console(const char *line, int len)
*** 1661,1667 ****
  	 */
  	if (GetDatabaseEncoding() != GetPlatformEncoding() &&
  		!in_error_recursion_trouble() &&
! 		!redirection_done)
  	{
  		WCHAR	   *utf16;
  		int			utf16len;
--- 1661,1668 ----
  	 */
  	if (GetDatabaseEncoding() != GetPlatformEncoding() &&
  		!in_error_recursion_trouble() &&
! 		!redirection_done &&
! 		CurrentMemoryContext)
  	{
  		WCHAR	   *utf16;
  		int			utf16len;