*** pgsql/src/backend/executor/execQual.c	2009/01/09 15:46:10	1.241
--- pgsql/src/backend/executor/execQual.c	2009/03/26 22:26:06	1.242
***************
*** 8,14 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.240 2009/01/01 17:23:41 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 8,14 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.241 2009/01/09 15:46:10 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** ExecEvalVar(ExprState *exprstate, ExprCo
*** 616,622 ****
  				ereport(ERROR,
  						(errcode(ERRCODE_DATATYPE_MISMATCH),
  						 errmsg("table row type and query-specified row type do not match"),
! 						 errdetail("Table row contains %d attributes, but query expects %d.",
  								   slot_tupdesc->natts, var_tupdesc->natts)));
  			else if (var_tupdesc->natts < slot_tupdesc->natts)
  				needslow = true;
--- 616,624 ----
  				ereport(ERROR,
  						(errcode(ERRCODE_DATATYPE_MISMATCH),
  						 errmsg("table row type and query-specified row type do not match"),
! 						 errdetail(ngettext("Table row contains %d attribute, but query expects %d.",
! 									"Table row contains %d attributes, but query expects %d.",
! 									slot_tupdesc->natts),
  								   slot_tupdesc->natts, var_tupdesc->natts)));
  			else if (var_tupdesc->natts < slot_tupdesc->natts)
  				needslow = true;
*************** init_fcache(Oid foid, FuncExprState *fca
*** 1041,1047 ****
  	if (list_length(fcache->args) > FUNC_MAX_ARGS)
  		ereport(ERROR,
  				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
! 				 errmsg("cannot pass more than %d arguments to a function",
  						FUNC_MAX_ARGS)));
  
  	/* Set up the primary fmgr lookup information */
--- 1043,1051 ----
  	if (list_length(fcache->args) > FUNC_MAX_ARGS)
  		ereport(ERROR,
  				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
! 				 errmsg(ngettext("cannot pass more than %d argument to a function",
! 								 "cannot pass more than %d arguments to a function",
! 								 FUNC_MAX_ARGS),
  						FUNC_MAX_ARGS)));
  
  	/* Set up the primary fmgr lookup information */
*************** tupledesc_match(TupleDesc dst_tupdesc, T
*** 1310,1316 ****
  		ereport(ERROR,
  				(errcode(ERRCODE_DATATYPE_MISMATCH),
  				 errmsg("function return row and query-specified return row do not match"),
! 				 errdetail("Returned row contains %d attributes, but query expects %d.",
  						   src_tupdesc->natts, dst_tupdesc->natts)));
  
  	for (i = 0; i < dst_tupdesc->natts; i++)
--- 1314,1322 ----
  		ereport(ERROR,
  				(errcode(ERRCODE_DATATYPE_MISMATCH),
  				 errmsg("function return row and query-specified return row do not match"),
! 				 errdetail(ngettext("Returned row contains %d attribute, but query expects %d.",
! 							"Returned row contains %d attributes, but query expects %d.",
! 							src_tupdesc->natts),
  						   src_tupdesc->natts, dst_tupdesc->natts)));
  
  	for (i = 0; i < dst_tupdesc->natts; i++)