*** pgsql/src/backend/postmaster/postmaster.c	2008/06/27 01:53:20	1.505.2.6
--- pgsql/src/backend/postmaster/postmaster.c	2009/12/02 17:41:39	1.505.2.7
***************
*** 37,43 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.505.2.5 2007/08/02 23:17:20 adunstan Exp $
   *
   * NOTES
   *
--- 37,43 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.505.2.6 2008/06/27 01:53:20 momjian Exp $
   *
   * NOTES
   *
*************** retry1:
*** 1479,1484 ****
--- 1479,1486 ----
  				port->user_name = pstrdup(valptr);
  			else if (strcmp(nameptr, "options") == 0)
  				port->cmdline_options = pstrdup(valptr);
+ 			else if (strcmp(nameptr, "application_name") == 0)
+ 				/* ignore for compatibility with libpq >= 8.5 */ ;
  			else
  			{
  				/* Assume it's a generic GUC option */