exposing pg_controldata and pg_config as functions

diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index ccc030f..0d2e8f1 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 425,430 ****
--- 425,433 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..49c6f08 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,20 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
         sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
--- 14,33 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o ps_status.o rls.o \
         sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...aa3349d .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,312 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Copyright (c) 2015, PostgreSQL Global Development Group
+  * ALL RIGHTS RESERVED;
+  *
+  * Permission to use, copy, modify, and distribute this software and its
+  * documentation for any purpose, without fee, and without a written agreement
+  * is hereby granted, provided that the above copyright notice and this
+  * paragraph and the following two paragraphs appear in all copies.
+  *
+  * IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
+  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+  * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+  * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGE.
+  *
+  * THE AUTHOR AND DISTRIBUTORS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+  * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ static void cleanup_path(char *path);
+ static void get_configdata(void);
+ 
+ #ifdef PGDLLIMPORT
+ /* Postgres global */
+ extern PGDLLIMPORT char my_exec_path[];
+ #else
+ /* Postgres global */
+ extern DLLIMPORT char my_exec_path[];
+ #endif /* PGDLLIMPORT */
+ 
+ struct configdata
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ };
+ 
+ static struct configdata ConfigData[] =
+ {
+ 	{"BINDIR", NULL},
+ 	{"DOCDIR", NULL},
+ 	{"HTMLDIR", NULL},
+ 	{"INCLUDEDIR", NULL},
+ 	{"PKGINCLUDEDIR", NULL},
+ 	{"INCLUDEDIR-SERVER", NULL},
+ 	{"LIBDIR", NULL},
+ 	{"PKGLIBDIR", NULL},
+ 	{"LOCALEDIR", NULL},
+ 	{"MANDIR", NULL},
+ 	{"SHAREDIR", NULL},
+ 	{"SYSCONFDIR", NULL},
+ 	{"PGXS", NULL},
+ 	{"CONFIGURE", NULL},
+ 	{"CC", NULL},
+ 	{"CPPFLAGS", NULL},
+ 	{"CFLAGS", NULL},
+ 	{"CFLAGS_SL", NULL},
+ 	{"LDFLAGS", NULL},
+ 	{"LDFLAGS_EX", NULL},
+ 	{"LDFLAGS_SL", NULL},
+ 	{"LIBS", NULL},
+ 	{"VERSION", NULL},
+ 	{NULL, NULL}
+ };
+ 
+ static void get_configdata(void);
+ 
+ Datum pg_config(PG_FUNCTION_ARGS);
+ 
+ PG_FUNCTION_INFO_V1(pg_config);
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	get_configdata();
+ 	while (ConfigData[i].name)
+ 	{
+ 		values[0] = ConfigData[i].name;
+ 		values[1] = ConfigData[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 		++i;
+ 	}
+ 	
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
+ 
+ 
+ /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ static void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ static void
+ get_configdata(void)
+ {
+ 	char			path[MAXPGPATH];
+ 	char		   *lastsep;
+ 
+ 	strcpy(path, my_exec_path);
+ 	lastsep = strrchr(path, '/');
+ 	if (lastsep)
+ 		*lastsep = '\0';
+ 	cleanup_path(path);
+ 	ConfigData[0].setting = pstrdup(path);
+ 
+ 	get_doc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[1].setting = pstrdup(path);
+ 
+ 	get_html_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[2].setting = pstrdup(path);
+ 
+ 	get_include_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[3].setting = pstrdup(path);
+ 
+ 	get_pkginclude_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[4].setting = pstrdup(path);
+ 
+ 	get_includeserver_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[5].setting = pstrdup(path);
+ 
+ 	get_lib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[6].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[7].setting = pstrdup(path);
+ 
+ 	get_locale_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[8].setting = pstrdup(path);
+ 
+ 	get_man_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[9].setting = pstrdup(path);
+ 
+ 	get_share_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[10].setting = pstrdup(path);
+ 
+ 	get_etc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[11].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ 	cleanup_path(path);
+ 	ConfigData[12].setting = pstrdup(path);
+ 
+ #ifdef VAL_CONFIGURE
+ 	ConfigData[13].setting = pstrdup(VAL_CONFIGURE);
+ #else
+ 	ConfigData[13].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CC
+ 	ConfigData[14].setting = pstrdup(VAL_CC);
+ #else
+ 	ConfigData[14].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CPPFLAGS
+ 	ConfigData[15].setting = pstrdup(VAL_CPPFLAGS);
+ #else
+ 	ConfigData[15].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS
+ 	ConfigData[16].setting = pstrdup(VAL_CFLAGS);
+ #else
+ 	ConfigData[16].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS_SL
+ 	ConfigData[17].setting = pstrdup(VAL_CFLAGS_SL);
+ #else
+ 	ConfigData[17].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS
+ 	ConfigData[18].setting = pstrdup(VAL_LDFLAGS);
+ #else
+ 	ConfigData[18].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_EX
+ 	ConfigData[19].setting = pstrdup(VAL_LDFLAGS_EX);
+ #else
+ 	ConfigData[19].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_SL
+ 	ConfigData[20].setting = pstrdup(VAL_LDFLAGS_SL);
+ #else
+ 	ConfigData[20].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LIBS
+ 	ConfigData[21].setting = pstrdup(VAL_LIBS);
+ #else
+ 	ConfigData[21].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ 	ConfigData[22].setting = pstrdup("PostgreSQL " PG_VERSION);
+ }
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index ddf7c67..e375059 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5331,5336 ****
--- 5331,5340 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_config */
+ DATA(insert OID = 3300 (  pg_config	PGNSP PGUID 12 1 1000 0 0 f f f f t t i 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index fc1679e..edd69f8 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1121,1126 ****
--- 1121,1129 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 44c6740..b4e7511 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1313 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,

diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index ccc030f..7b5db32 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 425,430 ****
--- 425,436 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
+ CREATE VIEW pg_controldata AS
+     SELECT * FROM pg_controldata();
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..13b60f7 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,34 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS = guc.o help_config.o pg_config.o pg_controldata.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...475a9c5 .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,280 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Copyright (c) 2015, PostgreSQL Global Development Group
+  * ALL RIGHTS RESERVED;
+  *
+  * Permission to use, copy, modify, and distribute this software and its
+  * documentation for any purpose, without fee, and without a written agreement
+  * is hereby granted, provided that the above copyright notice and this
+  * paragraph and the following two paragraphs appear in all copies.
+  *
+  * IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
+  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+  * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+  * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGE.
+  *
+  * THE AUTHOR AND DISTRIBUTORS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+  * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "utils/builtins.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ static void get_configdata(void);
+ 
+ #ifdef PGDLLIMPORT
+ /* Postgres global */
+ extern PGDLLIMPORT char my_exec_path[];
+ #else
+ /* Postgres global */
+ extern DLLIMPORT char my_exec_path[];
+ #endif /* PGDLLIMPORT */
+ 
+ struct configdata
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ };
+ 
+ static struct configdata ConfigData[] =
+ {
+ 	{"BINDIR", NULL},
+ 	{"DOCDIR", NULL},
+ 	{"HTMLDIR", NULL},
+ 	{"INCLUDEDIR", NULL},
+ 	{"PKGINCLUDEDIR", NULL},
+ 	{"INCLUDEDIR-SERVER", NULL},
+ 	{"LIBDIR", NULL},
+ 	{"PKGLIBDIR", NULL},
+ 	{"LOCALEDIR", NULL},
+ 	{"MANDIR", NULL},
+ 	{"SHAREDIR", NULL},
+ 	{"SYSCONFDIR", NULL},
+ 	{"PGXS", NULL},
+ 	{"CONFIGURE", NULL},
+ 	{"CC", NULL},
+ 	{"CPPFLAGS", NULL},
+ 	{"CFLAGS", NULL},
+ 	{"CFLAGS_SL", NULL},
+ 	{"LDFLAGS", NULL},
+ 	{"LDFLAGS_EX", NULL},
+ 	{"LDFLAGS_SL", NULL},
+ 	{"LIBS", NULL},
+ 	{"VERSION", NULL},
+ 	{NULL, NULL}
+ };
+ 
+ static void get_configdata(void);
+ 
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	get_configdata();
+ 	while (ConfigData[i].name)
+ 	{
+ 		values[0] = ConfigData[i].name;
+ 		values[1] = ConfigData[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 		++i;
+ 	}
+ 	
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
+ 
+ 
+ static void
+ get_configdata(void)
+ {
+ 	char			path[MAXPGPATH];
+ 	char		   *lastsep;
+ 
+ 	strcpy(path, my_exec_path);
+ 	lastsep = strrchr(path, '/');
+ 	if (lastsep)
+ 		*lastsep = '\0';
+ 	cleanup_path(path);
+ 	ConfigData[0].setting = pstrdup(path);
+ 
+ 	get_doc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[1].setting = pstrdup(path);
+ 
+ 	get_html_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[2].setting = pstrdup(path);
+ 
+ 	get_include_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[3].setting = pstrdup(path);
+ 
+ 	get_pkginclude_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[4].setting = pstrdup(path);
+ 
+ 	get_includeserver_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[5].setting = pstrdup(path);
+ 
+ 	get_lib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[6].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[7].setting = pstrdup(path);
+ 
+ 	get_locale_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[8].setting = pstrdup(path);
+ 
+ 	get_man_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[9].setting = pstrdup(path);
+ 
+ 	get_share_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[10].setting = pstrdup(path);
+ 
+ 	get_etc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[11].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ 	cleanup_path(path);
+ 	ConfigData[12].setting = pstrdup(path);
+ 
+ #ifdef VAL_CONFIGURE
+ 	ConfigData[13].setting = pstrdup(VAL_CONFIGURE);
+ #else
+ 	ConfigData[13].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CC
+ 	ConfigData[14].setting = pstrdup(VAL_CC);
+ #else
+ 	ConfigData[14].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CPPFLAGS
+ 	ConfigData[15].setting = pstrdup(VAL_CPPFLAGS);
+ #else
+ 	ConfigData[15].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS
+ 	ConfigData[16].setting = pstrdup(VAL_CFLAGS);
+ #else
+ 	ConfigData[16].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS_SL
+ 	ConfigData[17].setting = pstrdup(VAL_CFLAGS_SL);
+ #else
+ 	ConfigData[17].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS
+ 	ConfigData[18].setting = pstrdup(VAL_LDFLAGS);
+ #else
+ 	ConfigData[18].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_EX
+ 	ConfigData[19].setting = pstrdup(VAL_LDFLAGS_EX);
+ #else
+ 	ConfigData[19].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_SL
+ 	ConfigData[20].setting = pstrdup(VAL_LDFLAGS_SL);
+ #else
+ 	ConfigData[20].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LIBS
+ 	ConfigData[21].setting = pstrdup(VAL_LIBS);
+ #else
+ 	ConfigData[21].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ 	ConfigData[22].setting = pstrdup("PostgreSQL " PG_VERSION);
+ }
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index ...e8aa367 .
*** a/src/backend/utils/misc/pg_controldata.c
--- b/src/backend/utils/misc/pg_controldata.c
***************
*** 0 ****
--- 1,515 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_controldata.c
+  *		Expose same output as pg_controldata except as an SRF
+  *
+  * Copyright (c) 2015, PostgreSQL Global Development Group
+  * ALL RIGHTS RESERVED;
+  *
+  * Permission to use, copy, modify, and distribute this software and its
+  * documentation for any purpose, without fee, and without a written agreement
+  * is hereby granted, provided that the above copyright notice and this
+  * paragraph and the following two paragraphs appear in all copies.
+  *
+  * IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
+  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+  * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+  * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGE.
+  *
+  * THE AUTHOR AND DISTRIBUTORS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+  * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "access/xlog.h"
+ #include "access/xlog_internal.h"
+ #include "catalog/pg_control.h"
+ #include "catalog/pg_type.h"
+ #include "port/pg_crc32c.h"
+ #include "utils/builtins.h"
+ 
+ struct controldata
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ };
+ 
+ static struct controldata ControlData[] =
+ {
+ 	{gettext_noop("pg_control version number"), NULL},
+ 	{gettext_noop("Catalog version number"), NULL},
+ 	{gettext_noop("Database system identifier"), NULL},
+ 	{gettext_noop("Database cluster state"), NULL},
+ 	{gettext_noop("pg_control last modified"), NULL},
+ 	{gettext_noop("Latest checkpoint location"), NULL},
+ 	{gettext_noop("Prior checkpoint location"), NULL},
+ 	{gettext_noop("Latest checkpoint's REDO location"), NULL},
+ 	{gettext_noop("Latest checkpoint's REDO WAL file"), NULL},
+ 	{gettext_noop("Latest checkpoint's TimeLineID"), NULL},
+ 	{gettext_noop("Latest checkpoint's PrevTimeLineID"), NULL},
+ 	{gettext_noop("Latest checkpoint's full_page_writes"), NULL},
+ 	{gettext_noop("Latest checkpoint's NextXID"), NULL},
+ 	{gettext_noop("Latest checkpoint's NextOID"), NULL},
+ 	{gettext_noop("Latest checkpoint's NextMultiXactId"), NULL},
+ 	{gettext_noop("Latest checkpoint's NextMultiOffset"), NULL},
+ 	{gettext_noop("Latest checkpoint's oldestXID"), NULL},
+ 	{gettext_noop("Latest checkpoint's oldestXID's DB"), NULL},
+ 	{gettext_noop("Latest checkpoint's oldestActiveXID"), NULL},
+ 	{gettext_noop("Latest checkpoint's oldestMultiXid"), NULL},
+ 	{gettext_noop("Latest checkpoint's oldestMulti's DB"), NULL},
+ 	{gettext_noop("Latest checkpoint's oldestCommitTs"), NULL},
+ 	{gettext_noop("Time of latest checkpoint"), NULL},
+ 	{gettext_noop("Fake LSN counter for unlogged rels"), NULL},
+ 	{gettext_noop("Minimum recovery ending location"), NULL},
+ 	{gettext_noop("Min recovery ending loc's timeline"), NULL},
+ 	{gettext_noop("Backup start location"), NULL},
+ 	{gettext_noop("Backup end location"), NULL},
+ 	{gettext_noop("End-of-backup record required"), NULL},
+ 	{gettext_noop("wal_level setting"), NULL},
+ 	{gettext_noop("wal_log_hints setting"), NULL},
+ 	{gettext_noop("max_connections setting"), NULL},
+ 	{gettext_noop("max_worker_processes setting"), NULL},
+ 	{gettext_noop("max_prepared_xacts setting"), NULL},
+ 	{gettext_noop("max_locks_per_xact setting"), NULL},
+ 	{gettext_noop("track_commit_timestamp setting"), NULL},
+ 	{gettext_noop("Maximum data alignment"), NULL},
+ 	{gettext_noop("Database block size"), NULL},
+ 	{gettext_noop("Blocks per segment of large relation"), NULL},
+ 	{gettext_noop("WAL block size"), NULL},
+ 	{gettext_noop("Bytes per WAL segment"), NULL},
+ 	{gettext_noop("Maximum length of identifiers"), NULL},
+ 	{gettext_noop("Maximum columns in an index"), NULL},
+ 	{gettext_noop("Maximum size of a TOAST chunk"), NULL},
+ 	{gettext_noop("Size of a large-object chunk"), NULL},
+ 	{gettext_noop("Date/time type storage"), NULL},
+ 	{gettext_noop("Float4 argument passing"), NULL},
+ 	{gettext_noop("Float8 argument passing"), NULL},
+ 	{gettext_noop("Data page checksum version"), NULL},
+ 	{NULL, NULL}
+ };
+ 
+ 
+ static const char *dbState(DBState state);
+ static void get_controldata(void);
+ 
+ Datum
+ pg_controldata(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	get_controldata();
+ 	while (ControlData[i].name)
+ 	{
+ 		values[0] = _(ControlData[i].name);
+ 		values[1] = ControlData[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 		++i;
+ 	}
+ 	
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
+ 
+ static const char *
+ dbState(DBState state)
+ {
+ 	switch (state)
+ 	{
+ 		case DB_STARTUP:
+ 			return _("starting up");
+ 		case DB_SHUTDOWNED:
+ 			return _("shut down");
+ 		case DB_SHUTDOWNED_IN_RECOVERY:
+ 			return _("shut down in recovery");
+ 		case DB_SHUTDOWNING:
+ 			return _("shutting down");
+ 		case DB_IN_CRASH_RECOVERY:
+ 			return _("in crash recovery");
+ 		case DB_IN_ARCHIVE_RECOVERY:
+ 			return _("in archive recovery");
+ 		case DB_IN_PRODUCTION:
+ 			return _("in production");
+ 	}
+ 	return _("unrecognized status code");
+ }
+ 
+ static const char *
+ wal_level_str(WalLevel wal_level)
+ {
+ 	switch (wal_level)
+ 	{
+ 		case WAL_LEVEL_MINIMAL:
+ 			return "minimal";
+ 		case WAL_LEVEL_ARCHIVE:
+ 			return "archive";
+ 		case WAL_LEVEL_HOT_STANDBY:
+ 			return "hot_standby";
+ 		case WAL_LEVEL_LOGICAL:
+ 			return "logical";
+ 	}
+ 	return _("unrecognized wal_level");
+ }
+ 
+ static void
+ get_controldata(void)
+ {
+ 	ControlFileData ControlFile;
+ 	int				fd;
+ 	char			ControlFilePath[MAXPGPATH];
+ 	pg_crc32c		crc;
+ 	time_t			time_tmp;
+ 	char			pgctime_str[128];
+ 	char			ckpttime_str[128];
+ 	char			sysident_str[32];
+ 	const char	   *strftime_fmt = "%c";
+ 	XLogSegNo		segno;
+ 	char			xlogfilename[MAXFNAMELEN];
+ 	StringInfoData	buf;
+ 
+ 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
+ 
+ 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
+ 		elog(ERROR, "could not open file \"%s\" for reading: %s",
+ 					 ControlFilePath, strerror(errno));
+ 
+ 	if (read(fd, &ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
+ 		elog(ERROR, "could not read file \"%s\": %s",
+ 					 ControlFilePath, strerror(errno));
+ 
+ 	close(fd);
+ 
+ 	/* Check the CRC. */
+ 	INIT_CRC32C(crc);
+ 	COMP_CRC32C(crc,
+ 			   (char *) &ControlFile,
+ 			   offsetof(ControlFileData, crc));
+ 	FIN_CRC32C(crc);
+ 
+ 	if (!EQ_CRC32C(crc, ControlFile.crc))
+ 		elog(ERROR, "calculated CRC checksum does not match value stored in file");
+ 
+ 	/*
+ 	 * This slightly-chintzy coding will work as long as the control file
+ 	 * timestamps are within the range of time_t; that should be the case in
+ 	 * all foreseeable circumstances, so we don't bother importing the
+ 	 * backend's timezone library.
+ 	 *
+ 	 * Use variable for format to suppress overly-anal-retentive gcc warning
+ 	 * about %c
+ 	 */
+ 	time_tmp = (time_t) ControlFile.time;
+ 	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
+ 			 localtime(&time_tmp));
+ 	time_tmp = (time_t) ControlFile.checkPointCopy.time;
+ 	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
+ 			 localtime(&time_tmp));
+ 
+ 	/*
+ 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
+ 	 * start point.
+ 	 */
+ 	XLByteToSeg(ControlFile.checkPointCopy.redo, segno);
+ 	XLogFileName(xlogfilename, ControlFile.checkPointCopy.ThisTimeLineID, segno);
+ 
+ 	/*
+ 	 * Format system_identifier separately to keep platform-dependent format
+ 	 * code out of the translatable message string.
+ 	 */
+ 	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
+ 			 ControlFile.system_identifier);
+ 
+ 	initStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.pg_control_version);
+ 	ControlData[0].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.catalog_version_no);
+ 	ControlData[1].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s", sysident_str);
+ 	ControlData[2].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s", dbState(ControlFile.state));
+ 	ControlData[3].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s", pgctime_str);
+ 	ControlData[4].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%X/%X",
+ 					 (uint32) (ControlFile.checkPoint >> 32),
+ 					 (uint32) ControlFile.checkPoint);
+ 	ControlData[5].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%X/%X",
+ 					 (uint32) (ControlFile.prevCheckPoint >> 32),
+ 					 (uint32) ControlFile.prevCheckPoint);
+ 	ControlData[6].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%X/%X",
+ 					 (uint32) (ControlFile.checkPointCopy.redo >> 32),
+ 					 (uint32) ControlFile.checkPointCopy.redo);
+ 	ControlData[7].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s", xlogfilename);
+ 	ControlData[8].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.ThisTimeLineID);
+ 	ControlData[9].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.PrevTimeLineID);
+ 	ControlData[10].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s",
+ 					 ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
+ 	ControlData[11].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u/%u",
+ 					 ControlFile.checkPointCopy.nextXidEpoch,
+ 					 ControlFile.checkPointCopy.nextXid);
+ 	ControlData[12].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.nextOid);
+ 	ControlData[13].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.nextMulti);
+ 	ControlData[14].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.nextMultiOffset);
+ 	ControlData[15].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.oldestXid);
+ 	ControlData[16].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.oldestXidDB);
+ 	ControlData[17].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.oldestActiveXid);
+ 	ControlData[18].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.oldestMulti);
+ 	ControlData[19].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.oldestMultiDB);
+ 	ControlData[20].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.checkPointCopy.oldestCommitTs);
+ 	ControlData[21].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s", ckpttime_str);
+ 	ControlData[22].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%X/%X",
+ 					 (uint32) (ControlFile.unloggedLSN >> 32),
+ 					 (uint32) ControlFile.unloggedLSN);
+ 	ControlData[23].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%X/%X",
+ 					 (uint32) (ControlFile.minRecoveryPoint >> 32),
+ 					 (uint32) ControlFile.minRecoveryPoint);
+ 	ControlData[24].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.minRecoveryPointTLI);
+ 	ControlData[25].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%X/%X",
+ 					 (uint32) (ControlFile.backupStartPoint >> 32),
+ 					 (uint32) ControlFile.backupStartPoint);
+ 	ControlData[26].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%X/%X",
+ 					 (uint32) (ControlFile.backupEndPoint >> 32),
+ 					 (uint32) ControlFile.backupEndPoint);
+ 	ControlData[27].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s",
+ 					 ControlFile.backupEndRequired ? _("yes") : _("no"));
+ 	ControlData[28].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s", wal_level_str(ControlFile.wal_level));
+ 	ControlData[29].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s",
+ 					 ControlFile.wal_log_hints ? _("on") : _("off"));
+ 	ControlData[30].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%d", ControlFile.MaxConnections);
+ 	ControlData[31].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%d", ControlFile.max_worker_processes);
+ 	ControlData[32].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%d", ControlFile.max_prepared_xacts);
+ 	ControlData[33].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%d", ControlFile.max_locks_per_xact);
+ 	ControlData[34].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s",
+ 					 ControlFile.track_commit_timestamp ? _("on") : _("off"));
+ 	ControlData[35].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.maxAlign);
+ 	ControlData[36].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.blcksz);
+ 	ControlData[37].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.relseg_size);
+ 	ControlData[38].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.xlog_blcksz);
+ 	ControlData[39].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.xlog_seg_size);
+ 	ControlData[40].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.nameDataLen);
+ 	ControlData[41].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.indexMaxKeys);
+ 	ControlData[42].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.toast_max_chunk_size);
+ 	ControlData[43].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.loblksize);
+ 	ControlData[44].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s",
+ 					 (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
+ 	ControlData[45].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s",
+ 					 (ControlFile.float4ByVal ? _("by value") : _("by reference")));
+ 	ControlData[46].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%s",
+ 					 (ControlFile.float8ByVal ? _("by value") : _("by reference")));
+ 	ControlData[47].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ 
+ 	appendStringInfo(&buf, "%u", ControlFile.data_checksum_version);
+ 	ControlData[48].setting = pstrdup(buf.data);
+ 	resetStringInfo(&buf);
+ }
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 9b1f95d..25efc71 100644
*** a/src/bin/pg_config/pg_config.c
--- b/src/bin/pg_config/pg_config.c
***************
*** 29,65 ****
  static const char *progname;
  static char mypath[MAXPGPATH];
  
- 
- /*
-  * This function cleans up the paths for use with either cmd.exe or Msys
-  * on Windows. We need them to use filenames without spaces, for which a
-  * short filename is the safest equivalent, eg:
-  *		C:/Progra~1/
-  */
- static void
- cleanup_path(char *path)
- {
- #ifdef WIN32
- 	char	   *ptr;
- 
- 	/*
- 	 * GetShortPathName() will fail if the path does not exist, or short names
- 	 * are disabled on this file system.  In both cases, we just return the
- 	 * original path.  This is particularly useful for --sysconfdir, which
- 	 * might not exist.
- 	 */
- 	GetShortPathName(path, path, MAXPGPATH - 1);
- 
- 	/* Replace '\' with '/' */
- 	for (ptr = path; *ptr; ptr++)
- 	{
- 		if (*ptr == '\\')
- 			*ptr = '/';
- 	}
- #endif
- }
- 
- 
  /*
   * For each piece of information known to pg_config, we define a subroutine
   * to print it.  This is probably overkill, but it avoids code duplication
--- 29,34 ----
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index ddf7c67..e0ba271 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5331,5336 ****
--- 5331,5344 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_config */
+ DATA(insert OID = 3300 (  pg_config	PGNSP PGUID 12 1 1000 0 0 f f f f t t i 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
+ 
+ /* pg_controldata */
+ DATA(insert OID = 3308 (  pg_controldata	PGNSP PGUID 12 1 1000 0 0 f f f f t t i 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_controldata _null_ _null_ _null_ ));
+ DESCR("pg_controldata binary as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/port.h b/src/include/port.h
index 3787cbf..ab38f62 100644
*** a/src/include/port.h
--- b/src/include/port.h
*************** extern void join_path_components(char *r
*** 42,47 ****
--- 42,48 ----
  					 const char *head, const char *tail);
  extern void canonicalize_path(char *path);
  extern void make_native_path(char *path);
+ extern void cleanup_path(char *path);
  extern bool path_contains_parent_reference(const char *path);
  extern bool path_is_relative_and_below_cwd(const char *path);
  extern bool path_is_prefix_of_path(const char *path1, const char *path2);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index fc1679e..4a67a12 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1121,1126 ****
--- 1121,1132 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
+ /* pg_controldata.c */
+ extern Datum pg_controldata(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/port/path.c b/src/port/path.c
index d0f72df..7613666 100644
*** a/src/port/path.c
--- b/src/port/path.c
*************** make_native_path(char *filename)
*** 172,177 ****
--- 172,207 ----
  
  
  /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ 
+ /*
   * join_path_components - join two path components, inserting a slash
   *
   * We omit the slash if either given component is empty.
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 44c6740..85b4082 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1316 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
+ pg_controldata| SELECT pg_controldata.name,
+     pg_controldata.setting
+    FROM pg_controldata() pg_controldata(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,

diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 536c805..a50ffe8 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 433,438 ****
--- 433,444 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
+ REVOKE ALL on pg_config FROM PUBLIC;
+ REVOKE EXECUTE ON FUNCTION pg_config() FROM PUBLIC;
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..e0015d8 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,34 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...e29a706 .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,266 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_config.c
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "utils/builtins.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ static void get_configdata(void);
+ 
+ #ifdef PGDLLIMPORT
+ /* Postgres global */
+ extern PGDLLIMPORT char my_exec_path[];
+ #else
+ /* Postgres global */
+ extern DLLIMPORT char my_exec_path[];
+ #endif /* PGDLLIMPORT */
+ 
+ struct configdata
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ };
+ 
+ static struct configdata ConfigData[] =
+ {
+ 	{"BINDIR", NULL},
+ 	{"DOCDIR", NULL},
+ 	{"HTMLDIR", NULL},
+ 	{"INCLUDEDIR", NULL},
+ 	{"PKGINCLUDEDIR", NULL},
+ 	{"INCLUDEDIR-SERVER", NULL},
+ 	{"LIBDIR", NULL},
+ 	{"PKGLIBDIR", NULL},
+ 	{"LOCALEDIR", NULL},
+ 	{"MANDIR", NULL},
+ 	{"SHAREDIR", NULL},
+ 	{"SYSCONFDIR", NULL},
+ 	{"PGXS", NULL},
+ 	{"CONFIGURE", NULL},
+ 	{"CC", NULL},
+ 	{"CPPFLAGS", NULL},
+ 	{"CFLAGS", NULL},
+ 	{"CFLAGS_SL", NULL},
+ 	{"LDFLAGS", NULL},
+ 	{"LDFLAGS_EX", NULL},
+ 	{"LDFLAGS_SL", NULL},
+ 	{"LIBS", NULL},
+ 	{"VERSION", NULL},
+ 	{NULL, NULL}
+ };
+ 
+ static void get_configdata(void);
+ 
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	get_configdata();
+ 	while (ConfigData[i].name)
+ 	{
+ 		values[0] = ConfigData[i].name;
+ 		values[1] = ConfigData[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 		++i;
+ 	}
+ 	
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
+ 
+ 
+ static void
+ get_configdata(void)
+ {
+ 	char			path[MAXPGPATH];
+ 	char		   *lastsep;
+ 
+ 	strcpy(path, my_exec_path);
+ 	lastsep = strrchr(path, '/');
+ 	if (lastsep)
+ 		*lastsep = '\0';
+ 	cleanup_path(path);
+ 	ConfigData[0].setting = pstrdup(path);
+ 
+ 	get_doc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[1].setting = pstrdup(path);
+ 
+ 	get_html_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[2].setting = pstrdup(path);
+ 
+ 	get_include_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[3].setting = pstrdup(path);
+ 
+ 	get_pkginclude_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[4].setting = pstrdup(path);
+ 
+ 	get_includeserver_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[5].setting = pstrdup(path);
+ 
+ 	get_lib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[6].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[7].setting = pstrdup(path);
+ 
+ 	get_locale_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[8].setting = pstrdup(path);
+ 
+ 	get_man_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[9].setting = pstrdup(path);
+ 
+ 	get_share_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[10].setting = pstrdup(path);
+ 
+ 	get_etc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[11].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ 	cleanup_path(path);
+ 	ConfigData[12].setting = pstrdup(path);
+ 
+ #ifdef VAL_CONFIGURE
+ 	ConfigData[13].setting = pstrdup(VAL_CONFIGURE);
+ #else
+ 	ConfigData[13].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CC
+ 	ConfigData[14].setting = pstrdup(VAL_CC);
+ #else
+ 	ConfigData[14].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CPPFLAGS
+ 	ConfigData[15].setting = pstrdup(VAL_CPPFLAGS);
+ #else
+ 	ConfigData[15].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS
+ 	ConfigData[16].setting = pstrdup(VAL_CFLAGS);
+ #else
+ 	ConfigData[16].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS_SL
+ 	ConfigData[17].setting = pstrdup(VAL_CFLAGS_SL);
+ #else
+ 	ConfigData[17].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS
+ 	ConfigData[18].setting = pstrdup(VAL_LDFLAGS);
+ #else
+ 	ConfigData[18].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_EX
+ 	ConfigData[19].setting = pstrdup(VAL_LDFLAGS_EX);
+ #else
+ 	ConfigData[19].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_SL
+ 	ConfigData[20].setting = pstrdup(VAL_LDFLAGS_SL);
+ #else
+ 	ConfigData[20].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LIBS
+ 	ConfigData[21].setting = pstrdup(VAL_LIBS);
+ #else
+ 	ConfigData[21].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ 	ConfigData[22].setting = pstrdup("PostgreSQL " PG_VERSION);
+ }
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 9b1f95d..25efc71 100644
*** a/src/bin/pg_config/pg_config.c
--- b/src/bin/pg_config/pg_config.c
***************
*** 29,65 ****
  static const char *progname;
  static char mypath[MAXPGPATH];
  
- 
- /*
-  * This function cleans up the paths for use with either cmd.exe or Msys
-  * on Windows. We need them to use filenames without spaces, for which a
-  * short filename is the safest equivalent, eg:
-  *		C:/Progra~1/
-  */
- static void
- cleanup_path(char *path)
- {
- #ifdef WIN32
- 	char	   *ptr;
- 
- 	/*
- 	 * GetShortPathName() will fail if the path does not exist, or short names
- 	 * are disabled on this file system.  In both cases, we just return the
- 	 * original path.  This is particularly useful for --sysconfdir, which
- 	 * might not exist.
- 	 */
- 	GetShortPathName(path, path, MAXPGPATH - 1);
- 
- 	/* Replace '\' with '/' */
- 	for (ptr = path; *ptr; ptr++)
- 	{
- 		if (*ptr == '\\')
- 			*ptr = '/';
- 	}
- #endif
- }
- 
- 
  /*
   * For each piece of information known to pg_config, we define a subroutine
   * to print it.  This is probably overkill, but it avoids code duplication
--- 29,34 ----
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index d8640db..2e1a418 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5337,5342 ****
--- 5337,5346 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v r 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_config */
+ DATA(insert OID = 3330 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/port.h b/src/include/port.h
index 3787cbf..ab38f62 100644
*** a/src/include/port.h
--- b/src/include/port.h
*************** extern void join_path_components(char *r
*** 42,47 ****
--- 42,48 ----
  					 const char *head, const char *tail);
  extern void canonicalize_path(char *path);
  extern void make_native_path(char *path);
+ extern void cleanup_path(char *path);
  extern bool path_contains_parent_reference(const char *path);
  extern bool path_is_relative_and_below_cwd(const char *path);
  extern bool path_is_prefix_of_path(const char *path1, const char *path2);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index e610bf3..d0abb82 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1123,1128 ****
--- 1123,1131 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/port/path.c b/src/port/path.c
index d0f72df..7613666 100644
*** a/src/port/path.c
--- b/src/port/path.c
*************** make_native_path(char *filename)
*** 172,177 ****
--- 172,207 ----
  
  
  /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ 
+ /*
   * join_path_components - join two path components, inserting a slash
   *
   * We omit the slash if either given component is empty.
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 80374e4..151b8c1 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1313 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,

diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..80b139e 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,21 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_controldata.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index ...fd00ec7 .
*** a/src/backend/utils/misc/pg_controldata.c
--- b/src/backend/utils/misc/pg_controldata.c
***************
*** 0 ****
--- 1,358 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_controldata.c
+  *		Expose select pg_controldata output, except via SQL functions
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_controldata.c
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "access/htup_details.h"
+ #include "access/xlog_internal.h"
+ #include "catalog/pg_control.h"
+ #include "catalog/pg_type.h"
+ #include "common/controldata_utils.h"
+ #include "utils/builtins.h"
+ #include "utils/pg_lsn.h"
+ #include "utils/timestamp.h"
+ 
+ extern controldata *ControlData;
+ 
+ Datum
+ pg_controldata_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[4];
+ 	bool				nulls[4];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(4, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pg_control_version",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "catalog_version_no",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "system_identifier",
+ 					   INT8OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "pg_control_last_modified",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = Int32GetDatum(ControlFile->pg_control_version);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->catalog_version_no);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int64GetDatum(ControlFile->system_identifier);
+ 	nulls[2] = false;
+ 
+ 	values[3] = TimestampTzGetDatum(time_t_to_timestamptz(ControlFile->time));
+ 	nulls[3] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_checkpoint_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[19];
+ 	bool				nulls[19];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 	XLogSegNo			segno;
+ 	char				xlogfilename[MAXFNAMELEN];
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(19, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "checkpoint_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "prior_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "redo_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "redo_wal_file",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "prev_timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "full_page_writes",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "next_xid",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "next_oid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "next_multixact_id",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "next_multi_offset",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "oldest_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "oldest_xid_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 14, "oldest_active_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 15, "oldest_multi_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 16, "oldest_multi_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 17, "oldest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 18, "newest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 19, "checkpoint_time",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* Read the control file. */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	/* Make sure it is valid. */
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	/*
+ 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
+ 	 * start point.
+ 	 */
+ 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
+ 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+ 
+ 	/* Populate the values and null arrays */
+ 	values[0] = LSNGetDatum(ControlFile->checkPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = LSNGetDatum(ControlFile->prevCheckPoint);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->checkPointCopy.redo);
+ 	nulls[2] = false;
+ 
+ 	values[3] = CStringGetTextDatum(xlogfilename);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->checkPointCopy.ThisTimeLineID);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->checkPointCopy.PrevTimeLineID);
+ 	nulls[5] = false;
+ 
+ 	values[6] = BoolGetDatum(ControlFile->checkPointCopy.fullPageWrites);
+ 	nulls[6] = false;
+ 
+ 	values[7] = CStringGetTextDatum(psprintf("%u:%u",
+ 								ControlFile->checkPointCopy.nextXidEpoch,
+ 								ControlFile->checkPointCopy.nextXid));
+ 	nulls[7] = false;
+ 
+ 	values[8] = ObjectIdGetDatum(ControlFile->checkPointCopy.nextOid);
+ 	nulls[8] = false;
+ 
+ 	values[9] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMulti);
+ 	nulls[9] = false;
+ 
+ 	values[10] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMultiOffset);
+ 	nulls[10] = false;
+ 
+ 	values[11] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestXid);
+ 	nulls[11] = false;
+ 
+ 	values[12] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestXidDB);
+ 	nulls[12] = false;
+ 
+ 	values[13] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestActiveXid);
+ 	nulls[13] = false;
+ 
+ 	values[14] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestMulti);
+ 	nulls[14] = false;
+ 
+ 	values[15] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestMultiDB);
+ 	nulls[15] = false;
+ 
+ 	values[16] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestCommitTsXid);
+ 	nulls[16] = false;
+ 
+ 	values[17] = TransactionIdGetDatum(ControlFile->checkPointCopy.newestCommitTsXid);
+ 	nulls[17] = false;
+ 
+ 	values[18] = TimestampTzGetDatum(
+ 					time_t_to_timestamptz(ControlFile->checkPointCopy.time));
+ 	nulls[18] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_recovery_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[5];
+ 	bool				nulls[5];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(5, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "min_recovery_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "min_recovery_end_timeline",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "backup_start_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "backup_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "end_of_backup_record_required",
+ 					   BOOLOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = LSNGetDatum(ControlFile->minRecoveryPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->minRecoveryPointTLI);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->backupStartPoint);
+ 	nulls[2] = false;
+ 
+ 	values[3] = LSNGetDatum(ControlFile->backupEndPoint);
+ 	nulls[3] = false;
+ 
+ 	values[4] = BoolGetDatum(ControlFile->backupEndRequired);
+ 	nulls[4] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_init_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[13];
+ 	bool				nulls[13];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(13, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "max_data_alignment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "database_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "blocks_per_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "wal_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "bytes_per_wal_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "max_identifier_length",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "max_index_columns",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "max_toast_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "large_object_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "bigint_timestamps",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "float4_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "float8_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "data_page_checksum_version",
+ 					   INT4OID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = Int32GetDatum(ControlFile->maxAlign);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->blcksz);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int32GetDatum(ControlFile->relseg_size);
+ 	nulls[2] = false;
+ 
+ 	values[3] = Int32GetDatum(ControlFile->xlog_blcksz);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->xlog_seg_size);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->nameDataLen);
+ 	nulls[5] = false;
+ 
+ 	values[6] = Int32GetDatum(ControlFile->indexMaxKeys);
+ 	nulls[6] = false;
+ 
+ 	values[7] = Int32GetDatum(ControlFile->toast_max_chunk_size);
+ 	nulls[7] = false;
+ 
+ 	values[8] = Int32GetDatum(ControlFile->loblksize);
+ 	nulls[8] = false;
+ 
+ 	values[9] = BoolGetDatum(ControlFile->enableIntTimes);
+ 	nulls[9] = false;
+ 
+ 	values[10] = BoolGetDatum(ControlFile->float4ByVal);
+ 	nulls[10] = false;
+ 
+ 	values[11] = BoolGetDatum(ControlFile->float8ByVal);
+ 	nulls[11] = false;
+ 
+ 	values[12] = Int32GetDatum(ControlFile->data_checksum_version);
+ 	nulls[12] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index e7e072f..75ed71b 100644
*** a/src/bin/pg_controldata/pg_controldata.c
--- b/src/bin/pg_controldata/pg_controldata.c
***************
*** 26,31 ****
--- 26,32 ----
  #include "access/xlog.h"
  #include "access/xlog_internal.h"
  #include "catalog/pg_control.h"
+ #include "common/controldata_utils.h"
  #include "pg_getopt.h"
  
  
*************** usage(const char *progname)
*** 45,108 ****
  }
  
  
! static const char *
! dbState(DBState state)
! {
! 	switch (state)
! 	{
! 		case DB_STARTUP:
! 			return _("starting up");
! 		case DB_SHUTDOWNED:
! 			return _("shut down");
! 		case DB_SHUTDOWNED_IN_RECOVERY:
! 			return _("shut down in recovery");
! 		case DB_SHUTDOWNING:
! 			return _("shutting down");
! 		case DB_IN_CRASH_RECOVERY:
! 			return _("in crash recovery");
! 		case DB_IN_ARCHIVE_RECOVERY:
! 			return _("in archive recovery");
! 		case DB_IN_PRODUCTION:
! 			return _("in production");
! 	}
! 	return _("unrecognized status code");
! }
! 
! static const char *
! wal_level_str(WalLevel wal_level)
! {
! 	switch (wal_level)
! 	{
! 		case WAL_LEVEL_MINIMAL:
! 			return "minimal";
! 		case WAL_LEVEL_ARCHIVE:
! 			return "archive";
! 		case WAL_LEVEL_HOT_STANDBY:
! 			return "hot_standby";
! 		case WAL_LEVEL_LOGICAL:
! 			return "logical";
! 	}
! 	return _("unrecognized wal_level");
! }
! 
! 
  int
  main(int argc, char *argv[])
  {
! 	ControlFileData ControlFile;
! 	int			fd;
! 	char		ControlFilePath[MAXPGPATH];
! 	char	   *DataDir = NULL;
! 	pg_crc32c	crc;
! 	time_t		time_tmp;
! 	char		pgctime_str[128];
! 	char		ckpttime_str[128];
! 	char		sysident_str[32];
! 	const char *strftime_fmt = "%c";
! 	const char *progname;
! 	XLogSegNo	segno;
! 	char		xlogfilename[MAXFNAMELEN];
! 	int			c;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_controldata"));
  
--- 46,62 ----
  }
  
  
! #define CONTROLDATANAME_LEN 39
! #define CONTROLDATANAME_FMT "%-39s%s\n"
  int
  main(int argc, char *argv[])
  {
! 	char		   *DataDir = NULL;
! 	controldata	   *ControlData;
! 	size_t			ControlData_len;
! 	char			ControlDataName[CONTROLDATANAME_LEN + 1];
! 	const char	   *progname;
! 	int				c, i;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_controldata"));
  
*************** main(int argc, char *argv[])
*** 161,338 ****
  		exit(1);
  	}
  
! 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
! 
! 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
! 	{
! 		fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
! 	}
! 
! 	if (read(fd, &ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
  	{
! 		fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
  	}
- 	close(fd);
- 
- 	/* Check the CRC. */
- 	INIT_CRC32C(crc);
- 	COMP_CRC32C(crc,
- 				(char *) &ControlFile,
- 				offsetof(ControlFileData, crc));
- 	FIN_CRC32C(crc);
- 
- 	if (!EQ_CRC32C(crc, ControlFile.crc))
- 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
- 				 "Either the file is corrupt, or it has a different layout than this program\n"
- 				 "is expecting.  The results below are untrustworthy.\n\n"));
- 
- 	/*
- 	 * This slightly-chintzy coding will work as long as the control file
- 	 * timestamps are within the range of time_t; that should be the case in
- 	 * all foreseeable circumstances, so we don't bother importing the
- 	 * backend's timezone library into pg_controldata.
- 	 *
- 	 * Use variable for format to suppress overly-anal-retentive gcc warning
- 	 * about %c
- 	 */
- 	time_tmp = (time_t) ControlFile.time;
- 	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
- 			 localtime(&time_tmp));
- 	time_tmp = (time_t) ControlFile.checkPointCopy.time;
- 	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
- 			 localtime(&time_tmp));
- 
- 	/*
- 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
- 	 * start point.
- 	 */
- 	XLByteToSeg(ControlFile.checkPointCopy.redo, segno);
- 	XLogFileName(xlogfilename, ControlFile.checkPointCopy.ThisTimeLineID, segno);
- 
- 	/*
- 	 * Format system_identifier separately to keep platform-dependent format
- 	 * code out of the translatable message string.
- 	 */
- 	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
- 			 ControlFile.system_identifier);
  
- 	printf(_("pg_control version number:            %u\n"),
- 		   ControlFile.pg_control_version);
- 	if (ControlFile.pg_control_version % 65536 == 0 && ControlFile.pg_control_version / 65536 != 0)
- 		printf(_("WARNING: possible byte ordering mismatch\n"
- 				 "The byte ordering used to store the pg_control file might not match the one\n"
- 				 "used by this program.  In that case the results below would be incorrect, and\n"
- 				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
- 	printf(_("Catalog version number:               %u\n"),
- 		   ControlFile.catalog_version_no);
- 	printf(_("Database system identifier:           %s\n"),
- 		   sysident_str);
- 	printf(_("Database cluster state:               %s\n"),
- 		   dbState(ControlFile.state));
- 	printf(_("pg_control last modified:             %s\n"),
- 		   pgctime_str);
- 	printf(_("Latest checkpoint location:           %X/%X\n"),
- 		   (uint32) (ControlFile.checkPoint >> 32),
- 		   (uint32) ControlFile.checkPoint);
- 	printf(_("Prior checkpoint location:            %X/%X\n"),
- 		   (uint32) (ControlFile.prevCheckPoint >> 32),
- 		   (uint32) ControlFile.prevCheckPoint);
- 	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
- 		   (uint32) (ControlFile.checkPointCopy.redo >> 32),
- 		   (uint32) ControlFile.checkPointCopy.redo);
- 	printf(_("Latest checkpoint's REDO WAL file:    %s\n"),
- 		   xlogfilename);
- 	printf(_("Latest checkpoint's TimeLineID:       %u\n"),
- 		   ControlFile.checkPointCopy.ThisTimeLineID);
- 	printf(_("Latest checkpoint's PrevTimeLineID:   %u\n"),
- 		   ControlFile.checkPointCopy.PrevTimeLineID);
- 	printf(_("Latest checkpoint's full_page_writes: %s\n"),
- 		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
- 	printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
- 		   ControlFile.checkPointCopy.nextXidEpoch,
- 		   ControlFile.checkPointCopy.nextXid);
- 	printf(_("Latest checkpoint's NextOID:          %u\n"),
- 		   ControlFile.checkPointCopy.nextOid);
- 	printf(_("Latest checkpoint's NextMultiXactId:  %u\n"),
- 		   ControlFile.checkPointCopy.nextMulti);
- 	printf(_("Latest checkpoint's NextMultiOffset:  %u\n"),
- 		   ControlFile.checkPointCopy.nextMultiOffset);
- 	printf(_("Latest checkpoint's oldestXID:        %u\n"),
- 		   ControlFile.checkPointCopy.oldestXid);
- 	printf(_("Latest checkpoint's oldestXID's DB:   %u\n"),
- 		   ControlFile.checkPointCopy.oldestXidDB);
- 	printf(_("Latest checkpoint's oldestActiveXID:  %u\n"),
- 		   ControlFile.checkPointCopy.oldestActiveXid);
- 	printf(_("Latest checkpoint's oldestMultiXid:   %u\n"),
- 		   ControlFile.checkPointCopy.oldestMulti);
- 	printf(_("Latest checkpoint's oldestMulti's DB: %u\n"),
- 		   ControlFile.checkPointCopy.oldestMultiDB);
- 	printf(_("Latest checkpoint's oldestCommitTsXid:%u\n"),
- 		   ControlFile.checkPointCopy.oldestCommitTsXid);
- 	printf(_("Latest checkpoint's newestCommitTsXid:%u\n"),
- 		   ControlFile.checkPointCopy.newestCommitTsXid);
- 	printf(_("Time of latest checkpoint:            %s\n"),
- 		   ckpttime_str);
- 	printf(_("Fake LSN counter for unlogged rels:   %X/%X\n"),
- 		   (uint32) (ControlFile.unloggedLSN >> 32),
- 		   (uint32) ControlFile.unloggedLSN);
- 	printf(_("Minimum recovery ending location:     %X/%X\n"),
- 		   (uint32) (ControlFile.minRecoveryPoint >> 32),
- 		   (uint32) ControlFile.minRecoveryPoint);
- 	printf(_("Min recovery ending loc's timeline:   %u\n"),
- 		   ControlFile.minRecoveryPointTLI);
- 	printf(_("Backup start location:                %X/%X\n"),
- 		   (uint32) (ControlFile.backupStartPoint >> 32),
- 		   (uint32) ControlFile.backupStartPoint);
- 	printf(_("Backup end location:                  %X/%X\n"),
- 		   (uint32) (ControlFile.backupEndPoint >> 32),
- 		   (uint32) ControlFile.backupEndPoint);
- 	printf(_("End-of-backup record required:        %s\n"),
- 		   ControlFile.backupEndRequired ? _("yes") : _("no"));
- 	printf(_("wal_level setting:                    %s\n"),
- 		   wal_level_str(ControlFile.wal_level));
- 	printf(_("wal_log_hints setting:                %s\n"),
- 		   ControlFile.wal_log_hints ? _("on") : _("off"));
- 	printf(_("max_connections setting:              %d\n"),
- 		   ControlFile.MaxConnections);
- 	printf(_("max_worker_processes setting:         %d\n"),
- 		   ControlFile.max_worker_processes);
- 	printf(_("max_prepared_xacts setting:           %d\n"),
- 		   ControlFile.max_prepared_xacts);
- 	printf(_("max_locks_per_xact setting:           %d\n"),
- 		   ControlFile.max_locks_per_xact);
- 	printf(_("track_commit_timestamp setting:       %s\n"),
- 		   ControlFile.track_commit_timestamp ? _("on") : _("off"));
- 	printf(_("Maximum data alignment:               %u\n"),
- 		   ControlFile.maxAlign);
- 	/* we don't print floatFormat since can't say much useful about it */
- 	printf(_("Database block size:                  %u\n"),
- 		   ControlFile.blcksz);
- 	printf(_("Blocks per segment of large relation: %u\n"),
- 		   ControlFile.relseg_size);
- 	printf(_("WAL block size:                       %u\n"),
- 		   ControlFile.xlog_blcksz);
- 	printf(_("Bytes per WAL segment:                %u\n"),
- 		   ControlFile.xlog_seg_size);
- 	printf(_("Maximum length of identifiers:        %u\n"),
- 		   ControlFile.nameDataLen);
- 	printf(_("Maximum columns in an index:          %u\n"),
- 		   ControlFile.indexMaxKeys);
- 	printf(_("Maximum size of a TOAST chunk:        %u\n"),
- 		   ControlFile.toast_max_chunk_size);
- 	printf(_("Size of a large-object chunk:         %u\n"),
- 		   ControlFile.loblksize);
- 	printf(_("Date/time type storage:               %s\n"),
- 		   (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
- 	printf(_("Float4 argument passing:              %s\n"),
- 		   (ControlFile.float4ByVal ? _("by value") : _("by reference")));
- 	printf(_("Float8 argument passing:              %s\n"),
- 		   (ControlFile.float8ByVal ? _("by value") : _("by reference")));
- 	printf(_("Data page checksum version:           %u\n"),
- 		   ControlFile.data_checksum_version);
  	return 0;
  }
--- 115,128 ----
  		exit(1);
  	}
  
! 	ControlData = get_controldata(DataDir, progname, &ControlData_len);
! 	for (i = 0; i < ControlData_len; i++)
  	{
! 		memset(ControlDataName, ' ', CONTROLDATANAME_LEN);
! 		snprintf (ControlDataName, CONTROLDATANAME_LEN,
! 				  "%s:", ControlData[i].name);
! 		printf(CONTROLDATANAME_FMT, ControlDataName, ControlData[i].setting);
  	}
  
  	return 0;
  }
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index f675c92..642ec54 100644
*** a/src/bin/pg_resetxlog/pg_resetxlog.c
--- b/src/bin/pg_resetxlog/pg_resetxlog.c
*************** PrintControlValues(bool guessed)
*** 646,652 ****
  		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
--- 646,652 ----
  		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
diff --git a/src/common/Makefile b/src/common/Makefile
index c47445e..5d04a6b 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 23,30 ****
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! OBJS_COMMON = exec.o pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
! 	rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 23,30 ----
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! OBJS_COMMON = controldata_utils.o exec.o pg_lzcompress.o pgfnames.o \
! 	psprintf.o relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c
index ...f7b12c8 .
*** a/src/common/controldata_utils.c
--- b/src/common/controldata_utils.c
***************
*** 0 ****
--- 1,378 ----
+ /*-------------------------------------------------------------------------
+  *
+  * controldata_utils.c
+  *		Common code for pg_controldata output
+  *
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *
+  * IDENTIFICATION
+  *	  src/common/controldata_utils.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ #include "postgres.h"
+ 
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+ #include "miscadmin.h"
+ #include "access/xlog.h"
+ #include "access/xlog_internal.h"
+ #include "catalog/pg_control.h"
+ #include "catalog/pg_type.h"
+ #include "common/controldata_utils.h"
+ #include "port/pg_crc32c.h"
+ #include "utils/builtins.h"
+ 
+ #ifndef FRONTEND
+ /* NOTE: caller must provide gettext call around str */
+ #define log_error(str, param1, param2)	\
+ 	elog(ERROR, str, param1, param2)
+ #else
+ #define log_error(str, param1, param2)	\
+ 	do { \
+ 			char *buf = psprintf("%%s: %s", str); \
+ 			fprintf(stderr, buf, progname, param1, param2); \
+ 			exit(2); \
+ 	} while (0)
+ #endif
+ 
+ static const char *dbState(DBState state);
+ static const char *wal_level_str(WalLevel wal_level);
+ 
+ static const char *const ControlDataNames[] =
+ {
+ 	gettext_noop("pg_control version number"),
+ 	gettext_noop("Catalog version number"),
+ 	gettext_noop("Database system identifier"),
+ 	gettext_noop("Database cluster state"),
+ 	gettext_noop("pg_control last modified"),
+ 	gettext_noop("Latest checkpoint location"),
+ 	gettext_noop("Prior checkpoint location"),
+ 	gettext_noop("Latest checkpoint's REDO location"),
+ 	gettext_noop("Latest checkpoint's REDO WAL file"),
+ 	gettext_noop("Latest checkpoint's TimeLineID"),
+ 	gettext_noop("Latest checkpoint's PrevTimeLineID"),
+ 	gettext_noop("Latest checkpoint's full_page_writes"),
+ 	gettext_noop("Latest checkpoint's NextXID"),
+ 	gettext_noop("Latest checkpoint's NextOID"),
+ 	gettext_noop("Latest checkpoint's NextMultiXactId"),
+ 	gettext_noop("Latest checkpoint's NextMultiOffset"),
+ 	gettext_noop("Latest checkpoint's oldestXID"),
+ 	gettext_noop("Latest checkpoint's oldestXID's DB"),
+ 	gettext_noop("Latest checkpoint's oldestActiveXID"),
+ 	gettext_noop("Latest checkpoint's oldestMultiXid"),
+ 	gettext_noop("Latest checkpoint's oldestMulti's DB"),
+ 	gettext_noop("Latest checkpoint's oldestCommitTsXid"),
+ 	gettext_noop("Latest checkpoint's newestCommitTsXid"),
+ 	gettext_noop("Time of latest checkpoint"),
+ 	gettext_noop("Fake LSN counter for unlogged rels"),
+ 	gettext_noop("Minimum recovery ending location"),
+ 	gettext_noop("Min recovery ending loc's timeline"),
+ 	gettext_noop("Backup start location"),
+ 	gettext_noop("Backup end location"),
+ 	gettext_noop("End-of-backup record required"),
+ 	gettext_noop("wal_level setting"),
+ 	gettext_noop("wal_log_hints setting"),
+ 	gettext_noop("max_connections setting"),
+ 	gettext_noop("max_worker_processes setting"),
+ 	gettext_noop("max_prepared_xacts setting"),
+ 	gettext_noop("max_locks_per_xact setting"),
+ 	gettext_noop("track_commit_timestamp setting"),
+ 	gettext_noop("Maximum data alignment"),
+ 	gettext_noop("Database block size"),
+ 	gettext_noop("Blocks per segment of large relation"),
+ 	gettext_noop("WAL block size"),
+ 	gettext_noop("Bytes per WAL segment"),
+ 	gettext_noop("Maximum length of identifiers"),
+ 	gettext_noop("Maximum columns in an index"),
+ 	gettext_noop("Maximum size of a TOAST chunk"),
+ 	gettext_noop("Size of a large-object chunk"),
+ 	gettext_noop("Date/time type storage"),
+ 	gettext_noop("Float4 argument passing"),
+ 	gettext_noop("Float8 argument passing"),
+ 	gettext_noop("Data page checksum version"),
+ 	NULL
+ };
+ 
+ static size_t
+ ControlDataNames_len(void)
+ {
+ 	size_t	i = 0;
+ 
+ 	while (ControlDataNames[i])
+ 		i++;
+ 
+ 	return i;
+ }
+ 
+ 
+ static const char *
+ dbState(DBState state)
+ {
+ 	switch (state)
+ 	{
+ 		case DB_STARTUP:
+ 			return _("starting up");
+ 		case DB_SHUTDOWNED:
+ 			return _("shut down");
+ 		case DB_SHUTDOWNED_IN_RECOVERY:
+ 			return _("shut down in recovery");
+ 		case DB_SHUTDOWNING:
+ 			return _("shutting down");
+ 		case DB_IN_CRASH_RECOVERY:
+ 			return _("in crash recovery");
+ 		case DB_IN_ARCHIVE_RECOVERY:
+ 			return _("in archive recovery");
+ 		case DB_IN_PRODUCTION:
+ 			return _("in production");
+ 	}
+ 	return _("unrecognized status code");
+ }
+ 
+ static const char *
+ wal_level_str(WalLevel wal_level)
+ {
+ 	switch (wal_level)
+ 	{
+ 		case WAL_LEVEL_MINIMAL:
+ 			return "minimal";
+ 		case WAL_LEVEL_ARCHIVE:
+ 			return "archive";
+ 		case WAL_LEVEL_HOT_STANDBY:
+ 			return "hot_standby";
+ 		case WAL_LEVEL_LOGICAL:
+ 			return "logical";
+ 	}
+ 	return _("unrecognized wal_level");
+ }
+ 
+ 
+ ControlFileData *
+ get_controlfile(char *DataDir, const char *progname)
+ {
+ 	ControlFileData	   *ControlFile;
+ 	int					fd;
+ 	char				ControlFilePath[MAXPGPATH];
+ 	pg_crc32c			crc;
+ 
+ 	ControlFile = palloc(sizeof(ControlFileData));
+ 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
+ 
+ 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
+ 		log_error(_("could not open file \"%s\" for reading: %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
+ 		log_error(_("could not read file \"%s\": %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	close(fd);
+ 
+ 	/* Check the CRC. */
+ 	INIT_CRC32C(crc);
+ 	COMP_CRC32C(crc,
+ 			   (char *) ControlFile,
+ 			   offsetof(ControlFileData, crc));
+ 	FIN_CRC32C(crc);
+ 
+ 	if (!EQ_CRC32C(crc, ControlFile->crc))
+ #ifndef FRONTEND
+ 		elog(ERROR, _("calculated CRC checksum does not match value stored in file"));
+ #else
+ 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
+ 				 "Either the file is corrupt, or it has a different layout than this program\n"
+ 				 "is expecting.  The results below are untrustworthy.\n\n"));
+ #endif
+ 
+ 	return ControlFile;
+ }
+ 
+ controldata *
+ get_controldata(char *DataDir, const char *progname,
+ 				size_t *controldata_len)
+ {
+ 	ControlFileData	   *ControlFile;
+ 	controldata		   *ControlData;
+ 	time_t				time_tmp;
+ 	char				pgctime_str[128];
+ 	char				ckpttime_str[128];
+ 	char				sysident_str[32];
+ 	const char		   *strftime_fmt = "%c";
+ 	XLogSegNo			segno;
+ 	char				xlogfilename[MAXFNAMELEN];
+ 	int					i;
+ 	int					idx = 0;
+ 
+ 	*controldata_len = ControlDataNames_len();
+ 	ControlData = palloc(*controldata_len * sizeof(controldata));
+ 
+ 	/*
+ 	 * initialize controldata names
+ 	 *
+ 	 * These better be in sync with the settings manually
+ 	 * defined below.
+ 	 */
+ 	for (i = 0; i < *controldata_len; i++)
+ 		ControlData[i].name = pstrdup(_(ControlDataNames[i]));
+ 
+ 	/* get a copy of the control file */
+ 	ControlFile = get_controlfile(DataDir, progname);
+ 
+ 	/*
+ 	 * This slightly-chintzy coding will work as long as the control file
+ 	 * timestamps are within the range of time_t; that should be the case in
+ 	 * all foreseeable circumstances, so we don't bother importing the
+ 	 * backend's timezone library.
+ 	 *
+ 	 * Use variable for format to suppress overly-anal-retentive gcc warning
+ 	 * about %c
+ 	 */
+ 	time_tmp = (time_t) ControlFile->time;
+ 	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
+ 			 localtime(&time_tmp));
+ 	time_tmp = (time_t) ControlFile->checkPointCopy.time;
+ 	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
+ 			 localtime(&time_tmp));
+ 
+ 	/*
+ 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
+ 	 * start point.
+ 	 */
+ 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
+ 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+ 
+ 	/*
+ 	 * Format system_identifier separately to keep platform-dependent format
+ 	 * code out of the translatable message string.
+ 	 */
+ 	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
+ 			 ControlFile->system_identifier);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ #ifndef FRONTEND
+ 		elog(ERROR, _("byte ordering mismatch"));
+ #else
+ 		printf(_("WARNING: possible byte ordering mismatch\n"
+ 				 "The byte ordering used to store the pg_control file might not match the one\n"
+ 				 "used by this program.  In that case the results below would be incorrect, and\n"
+ 				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
+ #endif
+ 
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->pg_control_version);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->catalog_version_no);
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		sysident_str);
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		dbState(ControlFile->state));
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		pgctime_str);
+ 	ControlData[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->checkPoint >> 32),
+ 		(uint32) ControlFile->checkPoint);
+ 	ControlData[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->prevCheckPoint >> 32),
+ 		(uint32) ControlFile->prevCheckPoint);
+ 	ControlData[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->checkPointCopy.redo >> 32),
+ 		(uint32) ControlFile->checkPointCopy.redo);
+ 	ControlData[idx++].setting = psprintf("%s", xlogfilename);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.ThisTimeLineID);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.PrevTimeLineID);
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		ControlFile->checkPointCopy.fullPageWrites ? _("on") : _("off"));
+ 	ControlData[idx++].setting = psprintf("%u:%u",
+ 		ControlFile->checkPointCopy.nextXidEpoch,
+ 		ControlFile->checkPointCopy.nextXid);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.nextOid);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.nextMulti);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.nextMultiOffset);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestXid);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestXidDB);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestActiveXid);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestMulti);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestMultiDB);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestCommitTsXid);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.newestCommitTsXid);
+ 	ControlData[idx++].setting = psprintf("%s", ckpttime_str);
+ 	ControlData[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->unloggedLSN >> 32),
+ 		(uint32) ControlFile->unloggedLSN);
+ 	ControlData[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->minRecoveryPoint >> 32),
+ 		(uint32) ControlFile->minRecoveryPoint);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->minRecoveryPointTLI);
+ 	ControlData[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->backupStartPoint >> 32),
+ 		(uint32) ControlFile->backupStartPoint);
+ 	ControlData[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->backupEndPoint >> 32),
+ 		(uint32) ControlFile->backupEndPoint);
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		ControlFile->backupEndRequired ? _("yes") : _("no"));
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		wal_level_str(ControlFile->wal_level));
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		ControlFile->wal_log_hints ? _("on") : _("off"));
+ 	ControlData[idx++].setting = psprintf("%d",
+ 		ControlFile->MaxConnections);
+ 	ControlData[idx++].setting = psprintf("%d",
+ 		ControlFile->max_worker_processes);
+ 	ControlData[idx++].setting = psprintf("%d",
+ 		ControlFile->max_prepared_xacts);
+ 	ControlData[idx++].setting = psprintf("%d",
+ 		ControlFile->max_locks_per_xact);
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		ControlFile->track_commit_timestamp ? _("on") : _("off"));
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->maxAlign);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->blcksz);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->relseg_size);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->xlog_blcksz);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->xlog_seg_size);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->nameDataLen);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->indexMaxKeys);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->toast_max_chunk_size);
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->loblksize);
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		(ControlFile->enableIntTimes ?
+ 		 _("64-bit integers") : _("floating-point numbers")));
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		(ControlFile->float4ByVal ? _("by value") : _("by reference")));
+ 	ControlData[idx++].setting = psprintf("%s",
+ 		(ControlFile->float8ByVal ? _("by value") : _("by reference")));
+ 	ControlData[idx++].setting = psprintf("%u",
+ 		ControlFile->data_checksum_version);
+ 
+ 	return ControlData;
+ }
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index d8640db..6923136 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5337,5342 ****
--- 5337,5355 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v r 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_controldata related functions */
+ DATA(insert OID = 3331 ( pg_controldata_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,20,1184}" "{o,o,o,o}" "{pg_control_version,catalog_version_no,system_identifier,pg_control_last_modified}" _null_ _null_ pg_controldata_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata general state information as a function");
+ 
+ DATA(insert OID = 3332 ( pg_checkpoint_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,3220,3220,25,23,23,16,25,26,28,28,28,26,28,28,26,28,28,1184}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{checkpoint_location,prior_location,redo_location,redo_wal_file,timeline_id,prev_timeline_id,full_page_writes,next_xid,next_oid,next_multixact_id,next_multi_offset,oldest_xid,oldest_xid_dbid,oldest_active_xid,oldest_multi_xid,oldest_multi_dbid,oldest_commit_ts_xid,newest_commit_ts_xid,checkpoint_time}" _null_ _null_ pg_checkpoint_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata checkpoint state information as a function");
+ 
+ DATA(insert OID = 3333 ( pg_recovery_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,23,3220,3220,16}" "{o,o,o,o,o}" "{min_recovery_end_location,min_recovery_end_timeline,backup_start_location,backup_end_location,end_of_backup_record_required}" _null_ _null_ pg_recovery_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata recovery state information as a function");
+ 
+ DATA(insert OID = 3334 ( pg_init_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,23,23,23,23,23,23,23,16,16,16,23}" "{o,o,o,o,o,o,o,o,o,o,o,o,o}" "{max_data_alignment,database_block_size,blocks_per_segment,wal_block_size,bytes_per_wal_segment,max_identifier_length,max_index_columns,max_toast_chunk_size,large_object_chunk_size,bigint_timestamps,float4_pass_by_value,float8_pass_by_value,data_page_checksum_version}" _null_ _null_ pg_init_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata init state information as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/common/controldata_utils.h b/src/include/common/controldata_utils.h
index ...70989ef .
*** a/src/include/common/controldata_utils.h
--- b/src/include/common/controldata_utils.h
***************
*** 0 ****
--- 1,23 ----
+ /*
+  * controldata_utils.h
+  *		Common code for pg_controldata output
+  *
+  *	Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  *	Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *	src/include/common/controldata_utils.h
+  */
+ #ifndef COMMON_CONTROLDATA_UTILS_H
+ #define COMMON_CONTROLDATA_UTILS_H
+ 
+ typedef struct controldata
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ } controldata;
+ 
+ extern ControlFileData *get_controlfile(char *DataDir, const char *progname);
+ extern controldata *get_controldata(char *DataDir, const char *progname,
+ 									size_t *controldata_len);
+ 
+ #endif   /* COMMON_CONTROLDATA_UTILS_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index e610bf3..f977279 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1123,1128 ****
--- 1123,1134 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_controldata.c */
+ extern Datum pg_controldata_state(PG_FUNCTION_ARGS);
+ extern Datum pg_checkpoint_state(PG_FUNCTION_ARGS);
+ extern Datum pg_recovery_state(PG_FUNCTION_ARGS);
+ extern Datum pg_init_state(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);

diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 923fe58..abf9a70 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 433,438 ****
--- 433,444 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
+ REVOKE ALL on pg_config FROM PUBLIC;
+ REVOKE EXECUTE ON FUNCTION pg_config() FROM PUBLIC;
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..a0c82c1 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,21 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...05ee67b .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,102 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_config.c
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "common/config_info.h"
+ #include "utils/builtins.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	configdata		   *ConfigData;
+ 	size_t				configdata_len;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	ConfigData = get_configdata(my_exec_path, &configdata_len);
+ 	for (i = 0; i < configdata_len; i++)
+ 	{
+ 		values[0] = ConfigData[i].name;
+ 		values[1] = ConfigData[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 	}
+ 	
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 4b14294..591402e 100644
*** a/src/bin/pg_config/pg_config.c
--- b/src/bin/pg_config/pg_config.c
***************
*** 25,387 ****
  #include "postgres_fe.h"
  
  #include "port.h"
  
  static const char *progname;
- static char mypath[MAXPGPATH];
- 
- 
- /*
-  * This function cleans up the paths for use with either cmd.exe or Msys
-  * on Windows. We need them to use filenames without spaces, for which a
-  * short filename is the safest equivalent, eg:
-  *		C:/Progra~1/
-  */
- static void
- cleanup_path(char *path)
- {
- #ifdef WIN32
- 	char	   *ptr;
- 
- 	/*
- 	 * GetShortPathName() will fail if the path does not exist, or short names
- 	 * are disabled on this file system.  In both cases, we just return the
- 	 * original path.  This is particularly useful for --sysconfdir, which
- 	 * might not exist.
- 	 */
- 	GetShortPathName(path, path, MAXPGPATH - 1);
- 
- 	/* Replace '\' with '/' */
- 	for (ptr = path; *ptr; ptr++)
- 	{
- 		if (*ptr == '\\')
- 			*ptr = '/';
- 	}
- #endif
- }
- 
- 
- /*
-  * For each piece of information known to pg_config, we define a subroutine
-  * to print it.  This is probably overkill, but it avoids code duplication
-  * and accidentally omitting items from the "all" display.
-  */
- 
- static void
- show_bindir(bool all)
- {
- 	char		path[MAXPGPATH];
- 	char	   *lastsep;
- 
- 	if (all)
- 		printf("BINDIR = ");
- 	/* assume we are located in the bindir */
- 	strcpy(path, mypath);
- 	lastsep = strrchr(path, '/');
- 
- 	if (lastsep)
- 		*lastsep = '\0';
- 
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_docdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("DOCDIR = ");
- 	get_doc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_htmldir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("HTMLDIR = ");
- 	get_html_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR = ");
- 	get_include_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkgincludedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGINCLUDEDIR = ");
- 	get_pkginclude_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir_server(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR-SERVER = ");
- 	get_includeserver_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_libdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LIBDIR = ");
- 	get_lib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkglibdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGLIBDIR = ");
- 	get_pkglib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_localedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LOCALEDIR = ");
- 	get_locale_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_mandir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("MANDIR = ");
- 	get_man_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sharedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SHAREDIR = ");
- 	get_share_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sysconfdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SYSCONFDIR = ");
- 	get_etc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pgxs(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PGXS = ");
- 	get_pkglib_path(mypath, path);
- 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_configure(bool all)
- {
- #ifdef VAL_CONFIGURE
- 	if (all)
- 		printf("CONFIGURE = ");
- 	printf("%s\n", VAL_CONFIGURE);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cc(bool all)
- {
- #ifdef VAL_CC
- 	if (all)
- 		printf("CC = ");
- 	printf("%s\n", VAL_CC);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cppflags(bool all)
- {
- #ifdef VAL_CPPFLAGS
- 	if (all)
- 		printf("CPPFLAGS = ");
- 	printf("%s\n", VAL_CPPFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags(bool all)
- {
- #ifdef VAL_CFLAGS
- 	if (all)
- 		printf("CFLAGS = ");
- 	printf("%s\n", VAL_CFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags_sl(bool all)
- {
- #ifdef VAL_CFLAGS_SL
- 	if (all)
- 		printf("CFLAGS_SL = ");
- 	printf("%s\n", VAL_CFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags(bool all)
- {
- #ifdef VAL_LDFLAGS
- 	if (all)
- 		printf("LDFLAGS = ");
- 	printf("%s\n", VAL_LDFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_ex(bool all)
- {
- #ifdef VAL_LDFLAGS_EX
- 	if (all)
- 		printf("LDFLAGS_EX = ");
- 	printf("%s\n", VAL_LDFLAGS_EX);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_sl(bool all)
- {
- #ifdef VAL_LDFLAGS_SL
- 	if (all)
- 		printf("LDFLAGS_SL = ");
- 	printf("%s\n", VAL_LDFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_libs(bool all)
- {
- #ifdef VAL_LIBS
- 	if (all)
- 		printf("LIBS = ");
- 	printf("%s\n", VAL_LIBS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_version(bool all)
- {
- 	if (all)
- 		printf("VERSION = ");
- 	printf("PostgreSQL " PG_VERSION "\n");
- }
- 
  
  /*
   * Table of known information items
--- 25,33 ----
  #include "postgres_fe.h"
  
  #include "port.h"
+ #include "common/config_info.h"
  
  static const char *progname;
  
  /*
   * Table of known information items
*************** show_version(bool all)
*** 391,423 ****
  typedef struct
  {
  	const char *switchname;
! 	void		(*show_func) (bool all);
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", show_bindir},
! 	{"--docdir", show_docdir},
! 	{"--htmldir", show_htmldir},
! 	{"--includedir", show_includedir},
! 	{"--pkgincludedir", show_pkgincludedir},
! 	{"--includedir-server", show_includedir_server},
! 	{"--libdir", show_libdir},
! 	{"--pkglibdir", show_pkglibdir},
! 	{"--localedir", show_localedir},
! 	{"--mandir", show_mandir},
! 	{"--sharedir", show_sharedir},
! 	{"--sysconfdir", show_sysconfdir},
! 	{"--pgxs", show_pgxs},
! 	{"--configure", show_configure},
! 	{"--cc", show_cc},
! 	{"--cppflags", show_cppflags},
! 	{"--cflags", show_cflags},
! 	{"--cflags_sl", show_cflags_sl},
! 	{"--ldflags", show_ldflags},
! 	{"--ldflags_ex", show_ldflags_ex},
! 	{"--ldflags_sl", show_ldflags_sl},
! 	{"--libs", show_libs},
! 	{"--version", show_version},
  	{NULL, NULL}
  };
  
--- 37,69 ----
  typedef struct
  {
  	const char *switchname;
! 	const char *configname;
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", "BINDIR"},
! 	{"--docdir", "DOCDIR"},
! 	{"--htmldir", "HTMLDIR"},
! 	{"--includedir", "INCLUDEDIR"},
! 	{"--pkgincludedir", "PKGINCLUDEDIR"},
! 	{"--includedir-server", "INCLUDEDIR-SERVER"},
! 	{"--libdir", "LIBDIR"},
! 	{"--pkglibdir", "PKGLIBDIR"},
! 	{"--localedir", "LOCALEDIR"},
! 	{"--mandir", "MANDIR"},
! 	{"--sharedir", "SHAREDIR"},
! 	{"--sysconfdir", "SYSCONFDIR"},
! 	{"--pgxs", "PGXS"},
! 	{"--configure", "CONFIGURE"},
! 	{"--cc", "CC"},
! 	{"--cppflags", "CPPFLAGS"},
! 	{"--cflags", "CFLAGS"},
! 	{"--cflags_sl", "CFLAGS_SL"},
! 	{"--ldflags", "LDFLAGS"},
! 	{"--ldflags_ex", "LDFLAGS_EX"},
! 	{"--ldflags_sl", "LDFLAGS_SL"},
! 	{"--libs", "LIBS"},
! 	{"--version", "VERSION"},
  	{NULL, NULL}
  };
  
*************** advice(void)
*** 466,487 ****
  }
  
  static void
! show_all(void)
  {
  	int			i;
  
! 	for (i = 0; info_items[i].switchname != NULL; i++)
  	{
! 		(*info_items[i].show_func) (true);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
  	int			i;
  	int			j;
- 	int			ret;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
--- 112,139 ----
  }
  
  static void
! show_item(const char *configname,
! 		  configdata *ConfigData,
! 		  size_t configdata_len)
  {
  	int			i;
  
! 	for (i = 0; i < configdata_len; i++)
  	{
! 		if (strcmp(configname, ConfigData[i].name) == 0)
! 			printf("%s = %s\n", ConfigData[i].name, ConfigData[i].setting);
! 		++i;
  	}
  }
  
  int
  main(int argc, char **argv)
  {
+ 	configdata *ConfigData;
+ 	size_t		configdata_len;
+ 	char		my_exec_path[MAXPGPATH];
  	int			i;
  	int			j;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
*************** main(int argc, char **argv)
*** 497,524 ****
  		}
  	}
  
! 	ret = find_my_exec(argv[0], mypath);
! 
! 	if (ret)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		show_all();
  		exit(0);
  	}
  
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				(*info_items[j].show_func) (false);
  				break;
  			}
  		}
--- 149,178 ----
  		}
  	}
  
! 	if (find_my_exec(argv[0], my_exec_path) < 0)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
+ 	ConfigData = get_configdata(my_exec_path, &configdata_len);
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		for (i = 0; i < configdata_len; i++)
! 			printf("%s = %s\n", ConfigData[i].name, ConfigData[i].setting);
  		exit(0);
  	}
  
+ 	/* otherwise print requested items */
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				show_item(info_items[j].configname,
! 						  ConfigData, configdata_len);
  				break;
  			}
  		}
diff --git a/src/common/Makefile b/src/common/Makefile
index c47445e..0cbee41 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 23,30 ****
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! OBJS_COMMON = exec.o pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
! 	rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 23,43 ----
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS_COMMON = exec.o config_info.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 3df5ac5..ffc8096 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5186,5191 ****
--- 5186,5194 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v r 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_config */
+ DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
  
  /*
   * Symbolic values for provolatile column: these indicate whether the result
diff --git a/src/include/port.h b/src/include/port.h
index 9fc79f4..cb13dd8 100644
*** a/src/include/port.h
--- b/src/include/port.h
*************** extern void join_path_components(char *r
*** 42,47 ****
--- 42,48 ----
  					 const char *head, const char *tail);
  extern void canonicalize_path(char *path);
  extern void make_native_path(char *path);
+ extern void cleanup_path(char *path);
  extern bool path_contains_parent_reference(const char *path);
  extern bool path_is_relative_and_below_cwd(const char *path);
  extern bool path_is_prefix_of_path(const char *path1, const char *path2);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 477fde1..aa713c1 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1126,1131 ****
--- 1126,1134 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/port/path.c b/src/port/path.c
index a418f93..5c9de0c 100644
*** a/src/port/path.c
--- b/src/port/path.c
*************** make_native_path(char *filename)
*** 172,177 ****
--- 172,207 ----
  
  
  /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ 
+ /*
   * join_path_components - join two path components, inserting a slash
   *
   * We omit the slash if either given component is empty.
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 28b061f..4c84411 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1313 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,

diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
new file mode 100644
index 1f7b65e..aaaea7b
*** a/src/bin/pg_upgrade/controldata.c
--- b/src/bin/pg_upgrade/controldata.c
*************** get_control_data(ClusterInfo *cluster, b
*** 198,203 ****
--- 198,206 ----
  			cluster->controldata.chkpnt_nxtepoch = str2uint(p);
  
  			p = strchr(p, '/');
+ 			/* delimiter changed from '/' to ':' in 9.6 */
+ 			if (p == NULL && GET_MAJOR_VERSION(cluster->major_version) >= 906)
+ 				p = strchr(p, ':');
  			if (p == NULL || strlen(p) <= 1)
  				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
  

diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 923fe58..abf9a70 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 433,438 ****
--- 433,444 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
+ REVOKE ALL on pg_config FROM PUBLIC;
+ REVOKE EXECUTE ON FUNCTION pg_config() FROM PUBLIC;
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..a0c82c1 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,21 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...05ee67b .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,102 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_config.c
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "common/config_info.h"
+ #include "utils/builtins.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	configdata		   *ConfigData;
+ 	size_t				configdata_len;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	ConfigData = get_configdata(my_exec_path, &configdata_len);
+ 	for (i = 0; i < configdata_len; i++)
+ 	{
+ 		values[0] = ConfigData[i].name;
+ 		values[1] = ConfigData[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 	}
+ 	
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 4b14294..963a244 100644
*** a/src/bin/pg_config/pg_config.c
--- b/src/bin/pg_config/pg_config.c
***************
*** 25,387 ****
  #include "postgres_fe.h"
  
  #include "port.h"
  
  static const char *progname;
- static char mypath[MAXPGPATH];
- 
- 
- /*
-  * This function cleans up the paths for use with either cmd.exe or Msys
-  * on Windows. We need them to use filenames without spaces, for which a
-  * short filename is the safest equivalent, eg:
-  *		C:/Progra~1/
-  */
- static void
- cleanup_path(char *path)
- {
- #ifdef WIN32
- 	char	   *ptr;
- 
- 	/*
- 	 * GetShortPathName() will fail if the path does not exist, or short names
- 	 * are disabled on this file system.  In both cases, we just return the
- 	 * original path.  This is particularly useful for --sysconfdir, which
- 	 * might not exist.
- 	 */
- 	GetShortPathName(path, path, MAXPGPATH - 1);
- 
- 	/* Replace '\' with '/' */
- 	for (ptr = path; *ptr; ptr++)
- 	{
- 		if (*ptr == '\\')
- 			*ptr = '/';
- 	}
- #endif
- }
- 
- 
- /*
-  * For each piece of information known to pg_config, we define a subroutine
-  * to print it.  This is probably overkill, but it avoids code duplication
-  * and accidentally omitting items from the "all" display.
-  */
- 
- static void
- show_bindir(bool all)
- {
- 	char		path[MAXPGPATH];
- 	char	   *lastsep;
- 
- 	if (all)
- 		printf("BINDIR = ");
- 	/* assume we are located in the bindir */
- 	strcpy(path, mypath);
- 	lastsep = strrchr(path, '/');
- 
- 	if (lastsep)
- 		*lastsep = '\0';
- 
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_docdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("DOCDIR = ");
- 	get_doc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_htmldir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("HTMLDIR = ");
- 	get_html_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR = ");
- 	get_include_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkgincludedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGINCLUDEDIR = ");
- 	get_pkginclude_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir_server(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR-SERVER = ");
- 	get_includeserver_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_libdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LIBDIR = ");
- 	get_lib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkglibdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGLIBDIR = ");
- 	get_pkglib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_localedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LOCALEDIR = ");
- 	get_locale_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_mandir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("MANDIR = ");
- 	get_man_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sharedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SHAREDIR = ");
- 	get_share_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sysconfdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SYSCONFDIR = ");
- 	get_etc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pgxs(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PGXS = ");
- 	get_pkglib_path(mypath, path);
- 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_configure(bool all)
- {
- #ifdef VAL_CONFIGURE
- 	if (all)
- 		printf("CONFIGURE = ");
- 	printf("%s\n", VAL_CONFIGURE);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cc(bool all)
- {
- #ifdef VAL_CC
- 	if (all)
- 		printf("CC = ");
- 	printf("%s\n", VAL_CC);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cppflags(bool all)
- {
- #ifdef VAL_CPPFLAGS
- 	if (all)
- 		printf("CPPFLAGS = ");
- 	printf("%s\n", VAL_CPPFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags(bool all)
- {
- #ifdef VAL_CFLAGS
- 	if (all)
- 		printf("CFLAGS = ");
- 	printf("%s\n", VAL_CFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags_sl(bool all)
- {
- #ifdef VAL_CFLAGS_SL
- 	if (all)
- 		printf("CFLAGS_SL = ");
- 	printf("%s\n", VAL_CFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags(bool all)
- {
- #ifdef VAL_LDFLAGS
- 	if (all)
- 		printf("LDFLAGS = ");
- 	printf("%s\n", VAL_LDFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_ex(bool all)
- {
- #ifdef VAL_LDFLAGS_EX
- 	if (all)
- 		printf("LDFLAGS_EX = ");
- 	printf("%s\n", VAL_LDFLAGS_EX);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_sl(bool all)
- {
- #ifdef VAL_LDFLAGS_SL
- 	if (all)
- 		printf("LDFLAGS_SL = ");
- 	printf("%s\n", VAL_LDFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_libs(bool all)
- {
- #ifdef VAL_LIBS
- 	if (all)
- 		printf("LIBS = ");
- 	printf("%s\n", VAL_LIBS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_version(bool all)
- {
- 	if (all)
- 		printf("VERSION = ");
- 	printf("PostgreSQL " PG_VERSION "\n");
- }
- 
  
  /*
   * Table of known information items
--- 25,33 ----
  #include "postgres_fe.h"
  
  #include "port.h"
+ #include "common/config_info.h"
  
  static const char *progname;
  
  /*
   * Table of known information items
*************** show_version(bool all)
*** 391,423 ****
  typedef struct
  {
  	const char *switchname;
! 	void		(*show_func) (bool all);
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", show_bindir},
! 	{"--docdir", show_docdir},
! 	{"--htmldir", show_htmldir},
! 	{"--includedir", show_includedir},
! 	{"--pkgincludedir", show_pkgincludedir},
! 	{"--includedir-server", show_includedir_server},
! 	{"--libdir", show_libdir},
! 	{"--pkglibdir", show_pkglibdir},
! 	{"--localedir", show_localedir},
! 	{"--mandir", show_mandir},
! 	{"--sharedir", show_sharedir},
! 	{"--sysconfdir", show_sysconfdir},
! 	{"--pgxs", show_pgxs},
! 	{"--configure", show_configure},
! 	{"--cc", show_cc},
! 	{"--cppflags", show_cppflags},
! 	{"--cflags", show_cflags},
! 	{"--cflags_sl", show_cflags_sl},
! 	{"--ldflags", show_ldflags},
! 	{"--ldflags_ex", show_ldflags_ex},
! 	{"--ldflags_sl", show_ldflags_sl},
! 	{"--libs", show_libs},
! 	{"--version", show_version},
  	{NULL, NULL}
  };
  
--- 37,69 ----
  typedef struct
  {
  	const char *switchname;
! 	const char *configname;
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", "BINDIR"},
! 	{"--docdir", "DOCDIR"},
! 	{"--htmldir", "HTMLDIR"},
! 	{"--includedir", "INCLUDEDIR"},
! 	{"--pkgincludedir", "PKGINCLUDEDIR"},
! 	{"--includedir-server", "INCLUDEDIR-SERVER"},
! 	{"--libdir", "LIBDIR"},
! 	{"--pkglibdir", "PKGLIBDIR"},
! 	{"--localedir", "LOCALEDIR"},
! 	{"--mandir", "MANDIR"},
! 	{"--sharedir", "SHAREDIR"},
! 	{"--sysconfdir", "SYSCONFDIR"},
! 	{"--pgxs", "PGXS"},
! 	{"--configure", "CONFIGURE"},
! 	{"--cc", "CC"},
! 	{"--cppflags", "CPPFLAGS"},
! 	{"--cflags", "CFLAGS"},
! 	{"--cflags_sl", "CFLAGS_SL"},
! 	{"--ldflags", "LDFLAGS"},
! 	{"--ldflags_ex", "LDFLAGS_EX"},
! 	{"--ldflags_sl", "LDFLAGS_SL"},
! 	{"--libs", "LIBS"},
! 	{"--version", "VERSION"},
  	{NULL, NULL}
  };
  
*************** advice(void)
*** 466,487 ****
  }
  
  static void
! show_all(void)
  {
  	int			i;
  
! 	for (i = 0; info_items[i].switchname != NULL; i++)
  	{
! 		(*info_items[i].show_func) (true);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
  	int			i;
  	int			j;
- 	int			ret;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
--- 112,138 ----
  }
  
  static void
! show_item(const char *configname,
! 		  configdata *ConfigData,
! 		  size_t configdata_len)
  {
  	int			i;
  
! 	for (i = 0; i < configdata_len; i++)
  	{
! 		if (strcmp(configname, ConfigData[i].name) == 0)
! 			printf("%s = %s\n", ConfigData[i].name, ConfigData[i].setting);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
+ 	configdata *ConfigData;
+ 	size_t		configdata_len;
+ 	char		my_exec_path[MAXPGPATH];
  	int			i;
  	int			j;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
*************** main(int argc, char **argv)
*** 497,524 ****
  		}
  	}
  
! 	ret = find_my_exec(argv[0], mypath);
! 
! 	if (ret)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		show_all();
  		exit(0);
  	}
  
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				(*info_items[j].show_func) (false);
  				break;
  			}
  		}
--- 148,177 ----
  		}
  	}
  
! 	if (find_my_exec(argv[0], my_exec_path) < 0)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
+ 	ConfigData = get_configdata(my_exec_path, &configdata_len);
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		for (i = 0; i < configdata_len; i++)
! 			printf("%s = %s\n", ConfigData[i].name, ConfigData[i].setting);
  		exit(0);
  	}
  
+ 	/* otherwise print requested items */
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				show_item(info_items[j].configname,
! 						  ConfigData, configdata_len);
  				break;
  			}
  		}
diff --git a/src/common/Makefile b/src/common/Makefile
index c47445e..0cbee41 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 23,30 ****
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! OBJS_COMMON = exec.o pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
! 	rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 23,43 ----
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS_COMMON = exec.o config_info.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 3df5ac5..ffc8096 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5186,5191 ****
--- 5186,5194 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v r 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_config */
+ DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
  
  /*
   * Symbolic values for provolatile column: these indicate whether the result
diff --git a/src/include/port.h b/src/include/port.h
index 9fc79f4..cb13dd8 100644
*** a/src/include/port.h
--- b/src/include/port.h
*************** extern void join_path_components(char *r
*** 42,47 ****
--- 42,48 ----
  					 const char *head, const char *tail);
  extern void canonicalize_path(char *path);
  extern void make_native_path(char *path);
+ extern void cleanup_path(char *path);
  extern bool path_contains_parent_reference(const char *path);
  extern bool path_is_relative_and_below_cwd(const char *path);
  extern bool path_is_prefix_of_path(const char *path1, const char *path2);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 477fde1..aa713c1 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1126,1131 ****
--- 1126,1134 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/port/path.c b/src/port/path.c
index a418f93..5c9de0c 100644
*** a/src/port/path.c
--- b/src/port/path.c
*************** make_native_path(char *filename)
*** 172,177 ****
--- 172,207 ----
  
  
  /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ 
+ /*
   * join_path_components - join two path components, inserting a slash
   *
   * We omit the slash if either given component is empty.
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 28b061f..4c84411 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1313 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,

diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
new file mode 100644
index 2def729..34e194c
*** a/src/bin/pg_upgrade/controldata.c
--- b/src/bin/pg_upgrade/controldata.c
*************** get_control_data(ClusterInfo *cluster, b
*** 197,207 ****
  			p++;				/* remove ':' char */
  			cluster->controldata.chkpnt_nxtepoch = str2uint(p);
  
! 			p = strchr(p, '/');
  			if (p == NULL || strlen(p) <= 1)
  				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
  
! 			p++;				/* remove '/' char */
  			cluster->controldata.chkpnt_nxtxid = str2uint(p);
  			got_xid = true;
  		}
--- 197,214 ----
  			p++;				/* remove ':' char */
  			cluster->controldata.chkpnt_nxtepoch = str2uint(p);
  
! 			if (strchr(p, '/') != NULL)
! 				p = strchr(p, '/');
! 			/* delimiter changed from '/' to ':' in 9.6 */
! 			else if (GET_MAJOR_VERSION(cluster->major_version) >= 906)
! 				p = strchr(p, ':');
! 			else
! 				p = NULL;
! 
  			if (p == NULL || strlen(p) <= 1)
  				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
  
! 			p++;				/* remove '/' or ':' char */
  			cluster->controldata.chkpnt_nxtxid = str2uint(p);
  			got_xid = true;
  		}

diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 923fe58..abf9a70 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 433,438 ****
--- 433,444 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
+ REVOKE ALL on pg_config FROM PUBLIC;
+ REVOKE EXECUTE ON FUNCTION pg_config() FROM PUBLIC;
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..a0c82c1 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,21 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...d86460e .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,102 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_config.c
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "common/config_info.h"
+ #include "utils/builtins.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	configdata		   *ConfigData;
+ 	size_t				configdata_len;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	ConfigData = get_configdata(my_exec_path, &configdata_len);
+ 	for (i = 0; i < configdata_len; i++)
+ 	{
+ 		values[0] = ConfigData[i].name;
+ 		values[1] = ConfigData[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 	}
+ 
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 4b14294..963a244 100644
*** a/src/bin/pg_config/pg_config.c
--- b/src/bin/pg_config/pg_config.c
***************
*** 25,387 ****
  #include "postgres_fe.h"
  
  #include "port.h"
  
  static const char *progname;
- static char mypath[MAXPGPATH];
- 
- 
- /*
-  * This function cleans up the paths for use with either cmd.exe or Msys
-  * on Windows. We need them to use filenames without spaces, for which a
-  * short filename is the safest equivalent, eg:
-  *		C:/Progra~1/
-  */
- static void
- cleanup_path(char *path)
- {
- #ifdef WIN32
- 	char	   *ptr;
- 
- 	/*
- 	 * GetShortPathName() will fail if the path does not exist, or short names
- 	 * are disabled on this file system.  In both cases, we just return the
- 	 * original path.  This is particularly useful for --sysconfdir, which
- 	 * might not exist.
- 	 */
- 	GetShortPathName(path, path, MAXPGPATH - 1);
- 
- 	/* Replace '\' with '/' */
- 	for (ptr = path; *ptr; ptr++)
- 	{
- 		if (*ptr == '\\')
- 			*ptr = '/';
- 	}
- #endif
- }
- 
- 
- /*
-  * For each piece of information known to pg_config, we define a subroutine
-  * to print it.  This is probably overkill, but it avoids code duplication
-  * and accidentally omitting items from the "all" display.
-  */
- 
- static void
- show_bindir(bool all)
- {
- 	char		path[MAXPGPATH];
- 	char	   *lastsep;
- 
- 	if (all)
- 		printf("BINDIR = ");
- 	/* assume we are located in the bindir */
- 	strcpy(path, mypath);
- 	lastsep = strrchr(path, '/');
- 
- 	if (lastsep)
- 		*lastsep = '\0';
- 
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_docdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("DOCDIR = ");
- 	get_doc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_htmldir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("HTMLDIR = ");
- 	get_html_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR = ");
- 	get_include_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkgincludedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGINCLUDEDIR = ");
- 	get_pkginclude_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir_server(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR-SERVER = ");
- 	get_includeserver_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_libdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LIBDIR = ");
- 	get_lib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkglibdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGLIBDIR = ");
- 	get_pkglib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_localedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LOCALEDIR = ");
- 	get_locale_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_mandir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("MANDIR = ");
- 	get_man_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sharedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SHAREDIR = ");
- 	get_share_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sysconfdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SYSCONFDIR = ");
- 	get_etc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pgxs(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PGXS = ");
- 	get_pkglib_path(mypath, path);
- 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_configure(bool all)
- {
- #ifdef VAL_CONFIGURE
- 	if (all)
- 		printf("CONFIGURE = ");
- 	printf("%s\n", VAL_CONFIGURE);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cc(bool all)
- {
- #ifdef VAL_CC
- 	if (all)
- 		printf("CC = ");
- 	printf("%s\n", VAL_CC);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cppflags(bool all)
- {
- #ifdef VAL_CPPFLAGS
- 	if (all)
- 		printf("CPPFLAGS = ");
- 	printf("%s\n", VAL_CPPFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags(bool all)
- {
- #ifdef VAL_CFLAGS
- 	if (all)
- 		printf("CFLAGS = ");
- 	printf("%s\n", VAL_CFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags_sl(bool all)
- {
- #ifdef VAL_CFLAGS_SL
- 	if (all)
- 		printf("CFLAGS_SL = ");
- 	printf("%s\n", VAL_CFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags(bool all)
- {
- #ifdef VAL_LDFLAGS
- 	if (all)
- 		printf("LDFLAGS = ");
- 	printf("%s\n", VAL_LDFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_ex(bool all)
- {
- #ifdef VAL_LDFLAGS_EX
- 	if (all)
- 		printf("LDFLAGS_EX = ");
- 	printf("%s\n", VAL_LDFLAGS_EX);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_sl(bool all)
- {
- #ifdef VAL_LDFLAGS_SL
- 	if (all)
- 		printf("LDFLAGS_SL = ");
- 	printf("%s\n", VAL_LDFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_libs(bool all)
- {
- #ifdef VAL_LIBS
- 	if (all)
- 		printf("LIBS = ");
- 	printf("%s\n", VAL_LIBS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_version(bool all)
- {
- 	if (all)
- 		printf("VERSION = ");
- 	printf("PostgreSQL " PG_VERSION "\n");
- }
- 
  
  /*
   * Table of known information items
--- 25,33 ----
  #include "postgres_fe.h"
  
  #include "port.h"
+ #include "common/config_info.h"
  
  static const char *progname;
  
  /*
   * Table of known information items
*************** show_version(bool all)
*** 391,423 ****
  typedef struct
  {
  	const char *switchname;
! 	void		(*show_func) (bool all);
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", show_bindir},
! 	{"--docdir", show_docdir},
! 	{"--htmldir", show_htmldir},
! 	{"--includedir", show_includedir},
! 	{"--pkgincludedir", show_pkgincludedir},
! 	{"--includedir-server", show_includedir_server},
! 	{"--libdir", show_libdir},
! 	{"--pkglibdir", show_pkglibdir},
! 	{"--localedir", show_localedir},
! 	{"--mandir", show_mandir},
! 	{"--sharedir", show_sharedir},
! 	{"--sysconfdir", show_sysconfdir},
! 	{"--pgxs", show_pgxs},
! 	{"--configure", show_configure},
! 	{"--cc", show_cc},
! 	{"--cppflags", show_cppflags},
! 	{"--cflags", show_cflags},
! 	{"--cflags_sl", show_cflags_sl},
! 	{"--ldflags", show_ldflags},
! 	{"--ldflags_ex", show_ldflags_ex},
! 	{"--ldflags_sl", show_ldflags_sl},
! 	{"--libs", show_libs},
! 	{"--version", show_version},
  	{NULL, NULL}
  };
  
--- 37,69 ----
  typedef struct
  {
  	const char *switchname;
! 	const char *configname;
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", "BINDIR"},
! 	{"--docdir", "DOCDIR"},
! 	{"--htmldir", "HTMLDIR"},
! 	{"--includedir", "INCLUDEDIR"},
! 	{"--pkgincludedir", "PKGINCLUDEDIR"},
! 	{"--includedir-server", "INCLUDEDIR-SERVER"},
! 	{"--libdir", "LIBDIR"},
! 	{"--pkglibdir", "PKGLIBDIR"},
! 	{"--localedir", "LOCALEDIR"},
! 	{"--mandir", "MANDIR"},
! 	{"--sharedir", "SHAREDIR"},
! 	{"--sysconfdir", "SYSCONFDIR"},
! 	{"--pgxs", "PGXS"},
! 	{"--configure", "CONFIGURE"},
! 	{"--cc", "CC"},
! 	{"--cppflags", "CPPFLAGS"},
! 	{"--cflags", "CFLAGS"},
! 	{"--cflags_sl", "CFLAGS_SL"},
! 	{"--ldflags", "LDFLAGS"},
! 	{"--ldflags_ex", "LDFLAGS_EX"},
! 	{"--ldflags_sl", "LDFLAGS_SL"},
! 	{"--libs", "LIBS"},
! 	{"--version", "VERSION"},
  	{NULL, NULL}
  };
  
*************** advice(void)
*** 466,487 ****
  }
  
  static void
! show_all(void)
  {
  	int			i;
  
! 	for (i = 0; info_items[i].switchname != NULL; i++)
  	{
! 		(*info_items[i].show_func) (true);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
  	int			i;
  	int			j;
- 	int			ret;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
--- 112,138 ----
  }
  
  static void
! show_item(const char *configname,
! 		  configdata *ConfigData,
! 		  size_t configdata_len)
  {
  	int			i;
  
! 	for (i = 0; i < configdata_len; i++)
  	{
! 		if (strcmp(configname, ConfigData[i].name) == 0)
! 			printf("%s = %s\n", ConfigData[i].name, ConfigData[i].setting);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
+ 	configdata *ConfigData;
+ 	size_t		configdata_len;
+ 	char		my_exec_path[MAXPGPATH];
  	int			i;
  	int			j;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
*************** main(int argc, char **argv)
*** 497,524 ****
  		}
  	}
  
! 	ret = find_my_exec(argv[0], mypath);
! 
! 	if (ret)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		show_all();
  		exit(0);
  	}
  
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				(*info_items[j].show_func) (false);
  				break;
  			}
  		}
--- 148,177 ----
  		}
  	}
  
! 	if (find_my_exec(argv[0], my_exec_path) < 0)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
+ 	ConfigData = get_configdata(my_exec_path, &configdata_len);
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		for (i = 0; i < configdata_len; i++)
! 			printf("%s = %s\n", ConfigData[i].name, ConfigData[i].setting);
  		exit(0);
  	}
  
+ 	/* otherwise print requested items */
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				show_item(info_items[j].configname,
! 						  ConfigData, configdata_len);
  				break;
  			}
  		}
diff --git a/src/common/Makefile b/src/common/Makefile
index c47445e..0cbee41 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 23,30 ****
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! OBJS_COMMON = exec.o pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
! 	rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 23,43 ----
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS_COMMON = exec.o config_info.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
diff --git a/src/common/config_info.c b/src/common/config_info.c
index ...96f0e7b .
*** a/src/common/config_info.c
--- b/src/common/config_info.c
***************
*** 0 ****
--- 1,196 ----
+ /*-------------------------------------------------------------------------
+  *
+  * config_info.c
+  *		Common code for pg_config output
+  *
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *
+  * IDENTIFICATION
+  *	  src/common/controldata_utils.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "miscadmin.h"
+ #include "common/config_info.h"
+ 
+ static size_t ConfigDataNames_len(void);
+ 
+ static const char *const ConfigDataNames[] =
+ {
+ 	"BINDIR",
+ 	"DOCDIR",
+ 	"HTMLDIR",
+ 	"INCLUDEDIR",
+ 	"PKGINCLUDEDIR",
+ 	"INCLUDEDIR-SERVER",
+ 	"LIBDIR",
+ 	"PKGLIBDIR",
+ 	"LOCALEDIR",
+ 	"MANDIR",
+ 	"SHAREDIR",
+ 	"SYSCONFDIR",
+ 	"PGXS",
+ 	"CONFIGURE",
+ 	"CC",
+ 	"CPPFLAGS",
+ 	"CFLAGS",
+ 	"CFLAGS_SL",
+ 	"LDFLAGS",
+ 	"LDFLAGS_EX",
+ 	"LDFLAGS_SL",
+ 	"LIBS",
+ 	"VERSION",
+ 	NULL
+ };
+ 
+ static size_t
+ ConfigDataNames_len(void)
+ {
+ 	size_t	i = 0;
+ 
+ 	while (ConfigDataNames[i])
+ 		i++;
+ 
+ 	return i;
+ }
+ 
+ configdata *
+ get_configdata(char *my_exec_path, size_t *configdata_len)
+ {
+ 	configdata	   *ConfigData;
+ 	char			path[MAXPGPATH];
+ 	char		   *lastsep;
+ 	int				i;
+ 
+ 	*configdata_len = ConfigDataNames_len();
+ 	ConfigData = palloc(*configdata_len * sizeof(configdata));
+ 
+ 	/*
+ 	 * initialize configdata names
+ 	 *
+ 	 * These better be in sync with the settings manually
+ 	 * defined below.
+ 	 */
+ 	for (i = 0; i < *configdata_len; i++)
+ 		ConfigData[i].name = pstrdup(ConfigDataNames[i]);
+ 
+ 	strcpy(path, my_exec_path);
+ 	lastsep = strrchr(path, '/');
+ 	if (lastsep)
+ 		*lastsep = '\0';
+ 	cleanup_path(path);
+ 	ConfigData[0].setting = pstrdup(path);
+ 
+ 	get_doc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[1].setting = pstrdup(path);
+ 
+ 	get_html_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[2].setting = pstrdup(path);
+ 
+ 	get_include_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[3].setting = pstrdup(path);
+ 
+ 	get_pkginclude_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[4].setting = pstrdup(path);
+ 
+ 	get_includeserver_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[5].setting = pstrdup(path);
+ 
+ 	get_lib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[6].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[7].setting = pstrdup(path);
+ 
+ 	get_locale_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[8].setting = pstrdup(path);
+ 
+ 	get_man_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[9].setting = pstrdup(path);
+ 
+ 	get_share_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[10].setting = pstrdup(path);
+ 
+ 	get_etc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	ConfigData[11].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ 	cleanup_path(path);
+ 	ConfigData[12].setting = pstrdup(path);
+ 
+ #ifdef VAL_CONFIGURE
+ 	ConfigData[13].setting = pstrdup(VAL_CONFIGURE);
+ #else
+ 	ConfigData[13].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CC
+ 	ConfigData[14].setting = pstrdup(VAL_CC);
+ #else
+ 	ConfigData[14].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CPPFLAGS
+ 	ConfigData[15].setting = pstrdup(VAL_CPPFLAGS);
+ #else
+ 	ConfigData[15].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS
+ 	ConfigData[16].setting = pstrdup(VAL_CFLAGS);
+ #else
+ 	ConfigData[16].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS_SL
+ 	ConfigData[17].setting = pstrdup(VAL_CFLAGS_SL);
+ #else
+ 	ConfigData[17].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS
+ 	ConfigData[18].setting = pstrdup(VAL_LDFLAGS);
+ #else
+ 	ConfigData[18].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_EX
+ 	ConfigData[19].setting = pstrdup(VAL_LDFLAGS_EX);
+ #else
+ 	ConfigData[19].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_SL
+ 	ConfigData[20].setting = pstrdup(VAL_LDFLAGS_SL);
+ #else
+ 	ConfigData[20].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LIBS
+ 	ConfigData[21].setting = pstrdup(VAL_LIBS);
+ #else
+ 	ConfigData[21].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ 	ConfigData[22].setting = pstrdup("PostgreSQL " PG_VERSION);
+ 
+ 	return ConfigData;
+ }
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 3df5ac5..ffc8096 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5186,5191 ****
--- 5186,5194 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v r 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_config */
+ DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
  
  /*
   * Symbolic values for provolatile column: these indicate whether the result
diff --git a/src/include/common/config_info.h b/src/include/common/config_info.h
index ...762b66f .
*** a/src/include/common/config_info.h
--- b/src/include/common/config_info.h
***************
*** 0 ****
--- 1,21 ----
+ /*
+  * controldata_utils.h
+  *		Common code for pg_controldata output
+  *
+  *	Copyright (c) 2016, PostgreSQL Global Development Group
+  *
+  *	src/include/common/controldata_utils.h
+  */
+ #ifndef COMMON_CONFIG_INFO_H
+ #define COMMON_CONFIG_INFO_H
+ 
+ typedef struct configdata
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ } configdata;
+ 
+ extern configdata *get_configdata(char *my_exec_path,
+ 								  size_t *configdata_len);
+ 
+ #endif   /* COMMON_CONFIG_INFO_H */
diff --git a/src/include/port.h b/src/include/port.h
index 9fc79f4..cb13dd8 100644
*** a/src/include/port.h
--- b/src/include/port.h
*************** extern void join_path_components(char *r
*** 42,47 ****
--- 42,48 ----
  					 const char *head, const char *tail);
  extern void canonicalize_path(char *path);
  extern void make_native_path(char *path);
+ extern void cleanup_path(char *path);
  extern bool path_contains_parent_reference(const char *path);
  extern bool path_is_relative_and_below_cwd(const char *path);
  extern bool path_is_prefix_of_path(const char *path1, const char *path2);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 477fde1..aa713c1 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1126,1131 ****
--- 1126,1134 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/port/path.c b/src/port/path.c
index a418f93..5c9de0c 100644
*** a/src/port/path.c
--- b/src/port/path.c
*************** make_native_path(char *filename)
*** 172,177 ****
--- 172,207 ----
  
  
  /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ 
+ /*
   * join_path_components - join two path components, inserting a slash
   *
   * We omit the slash if either given component is empty.
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 28b061f..4c84411 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1313 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 1dba7d9..cc0dcb3 100644
*** a/src/tools/msvc/Mkvcbuild.pm
--- b/src/tools/msvc/Mkvcbuild.pm
*************** sub mkvcbuild
*** 106,113 ****
  	}
  
  	our @pgcommonallfiles = qw(
! 	  exec.c pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c
! 	  string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c
--- 106,113 ----
  	}
  
  	our @pgcommonallfiles = qw(
! 	  exec.c config_info.c pg_lzcompress.c pgfnames.c psprintf.c
! 	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c

diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c
index b694dea..2dcbfbd 100644
*** a/src/backend/access/rmgrdesc/xlogdesc.c
--- b/src/backend/access/rmgrdesc/xlogdesc.c
*************** xlog_desc(StringInfo buf, XLogReaderStat
*** 43,49 ****
  		CheckPoint *checkpoint = (CheckPoint *) rec;
  
  		appendStringInfo(buf, "redo %X/%X; "
! 						 "tli %u; prev tli %u; fpw %s; xid %u/%u; oid %u; multi %u; offset %u; "
  						 "oldest xid %u in DB %u; oldest multi %u in DB %u; "
  						 "oldest/newest commit timestamp xid: %u/%u; "
  						 "oldest running xid %u; %s",
--- 43,49 ----
  		CheckPoint *checkpoint = (CheckPoint *) rec;
  
  		appendStringInfo(buf, "redo %X/%X; "
! 						 "tli %u; prev tli %u; fpw %s; xid %u:%u; oid %u; multi %u; offset %u; "
  						 "oldest xid %u in DB %u; oldest multi %u in DB %u; "
  						 "oldest/newest commit timestamp xid: %u/%u; "
  						 "oldest running xid %u; %s",
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 7d5d493..ee87e1b 100644
*** a/src/backend/access/transam/xlog.c
--- b/src/backend/access/transam/xlog.c
*************** StartupXLOG(void)
*** 6284,6290 ****
  				  (uint32) (checkPoint.redo >> 32), (uint32) checkPoint.redo,
  					wasShutdown ? "TRUE" : "FALSE")));
  	ereport(DEBUG1,
! 			(errmsg_internal("next transaction ID: %u/%u; next OID: %u",
  					checkPoint.nextXidEpoch, checkPoint.nextXid,
  					checkPoint.nextOid)));
  	ereport(DEBUG1,
--- 6284,6290 ----
  				  (uint32) (checkPoint.redo >> 32), (uint32) checkPoint.redo,
  					wasShutdown ? "TRUE" : "FALSE")));
  	ereport(DEBUG1,
! 			(errmsg_internal("next transaction ID: %u:%u; next OID: %u",
  					checkPoint.nextXidEpoch, checkPoint.nextXid,
  					checkPoint.nextOid)));
  	ereport(DEBUG1,
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index e7e072f..5dd2dbc 100644
*** a/src/bin/pg_controldata/pg_controldata.c
--- b/src/bin/pg_controldata/pg_controldata.c
*************** main(int argc, char *argv[])
*** 252,258 ****
  		   ControlFile.checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
--- 252,258 ----
  		   ControlFile.checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index ca706a5..525b82b 100644
*** a/src/bin/pg_resetxlog/pg_resetxlog.c
--- b/src/bin/pg_resetxlog/pg_resetxlog.c
*************** PrintControlValues(bool guessed)
*** 646,652 ****
  		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
--- 646,652 ----
  		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 2def729..34e194c 100644
*** a/src/bin/pg_upgrade/controldata.c
--- b/src/bin/pg_upgrade/controldata.c
*************** get_control_data(ClusterInfo *cluster, b
*** 197,207 ****
  			p++;				/* remove ':' char */
  			cluster->controldata.chkpnt_nxtepoch = str2uint(p);
  
! 			p = strchr(p, '/');
  			if (p == NULL || strlen(p) <= 1)
  				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
  
! 			p++;				/* remove '/' char */
  			cluster->controldata.chkpnt_nxtxid = str2uint(p);
  			got_xid = true;
  		}
--- 197,214 ----
  			p++;				/* remove ':' char */
  			cluster->controldata.chkpnt_nxtepoch = str2uint(p);
  
! 			if (strchr(p, '/') != NULL)
! 				p = strchr(p, '/');
! 			/* delimiter changed from '/' to ':' in 9.6 */
! 			else if (GET_MAJOR_VERSION(cluster->major_version) >= 906)
! 				p = strchr(p, ':');
! 			else
! 				p = NULL;
! 
  			if (p == NULL || strlen(p) <= 1)
  				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
  
! 			p++;				/* remove '/' or ':' char */
  			cluster->controldata.chkpnt_nxtxid = str2uint(p);
  			got_xid = true;
  		}

diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c
index b694dea..2dcbfbd 100644
*** a/src/backend/access/rmgrdesc/xlogdesc.c
--- b/src/backend/access/rmgrdesc/xlogdesc.c
*************** xlog_desc(StringInfo buf, XLogReaderStat
*** 43,49 ****
  		CheckPoint *checkpoint = (CheckPoint *) rec;
  
  		appendStringInfo(buf, "redo %X/%X; "
! 						 "tli %u; prev tli %u; fpw %s; xid %u/%u; oid %u; multi %u; offset %u; "
  						 "oldest xid %u in DB %u; oldest multi %u in DB %u; "
  						 "oldest/newest commit timestamp xid: %u/%u; "
  						 "oldest running xid %u; %s",
--- 43,49 ----
  		CheckPoint *checkpoint = (CheckPoint *) rec;
  
  		appendStringInfo(buf, "redo %X/%X; "
! 						 "tli %u; prev tli %u; fpw %s; xid %u:%u; oid %u; multi %u; offset %u; "
  						 "oldest xid %u in DB %u; oldest multi %u in DB %u; "
  						 "oldest/newest commit timestamp xid: %u/%u; "
  						 "oldest running xid %u; %s",
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 7d5d493..ee87e1b 100644
*** a/src/backend/access/transam/xlog.c
--- b/src/backend/access/transam/xlog.c
*************** StartupXLOG(void)
*** 6284,6290 ****
  				  (uint32) (checkPoint.redo >> 32), (uint32) checkPoint.redo,
  					wasShutdown ? "TRUE" : "FALSE")));
  	ereport(DEBUG1,
! 			(errmsg_internal("next transaction ID: %u/%u; next OID: %u",
  					checkPoint.nextXidEpoch, checkPoint.nextXid,
  					checkPoint.nextOid)));
  	ereport(DEBUG1,
--- 6284,6290 ----
  				  (uint32) (checkPoint.redo >> 32), (uint32) checkPoint.redo,
  					wasShutdown ? "TRUE" : "FALSE")));
  	ereport(DEBUG1,
! 			(errmsg_internal("next transaction ID: %u:%u; next OID: %u",
  					checkPoint.nextXidEpoch, checkPoint.nextXid,
  					checkPoint.nextOid)));
  	ereport(DEBUG1,
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index e7e072f..5dd2dbc 100644
*** a/src/bin/pg_controldata/pg_controldata.c
--- b/src/bin/pg_controldata/pg_controldata.c
*************** main(int argc, char *argv[])
*** 252,258 ****
  		   ControlFile.checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
--- 252,258 ----
  		   ControlFile.checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index ca706a5..525b82b 100644
*** a/src/bin/pg_resetxlog/pg_resetxlog.c
--- b/src/bin/pg_resetxlog/pg_resetxlog.c
*************** PrintControlValues(bool guessed)
*** 646,652 ****
  		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
--- 646,652 ----
  		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
  		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
! 	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
  		   ControlFile.checkPointCopy.nextXidEpoch,
  		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 2def729..34e194c 100644
*** a/src/bin/pg_upgrade/controldata.c
--- b/src/bin/pg_upgrade/controldata.c
*************** get_control_data(ClusterInfo *cluster, b
*** 197,207 ****
  			p++;				/* remove ':' char */
  			cluster->controldata.chkpnt_nxtepoch = str2uint(p);
  
! 			p = strchr(p, '/');
  			if (p == NULL || strlen(p) <= 1)
  				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
  
! 			p++;				/* remove '/' char */
  			cluster->controldata.chkpnt_nxtxid = str2uint(p);
  			got_xid = true;
  		}
--- 197,214 ----
  			p++;				/* remove ':' char */
  			cluster->controldata.chkpnt_nxtepoch = str2uint(p);
  
! 			if (strchr(p, '/') != NULL)
! 				p = strchr(p, '/');
! 			/* delimiter changed from '/' to ':' in 9.6 */
! 			else if (GET_MAJOR_VERSION(cluster->major_version) >= 906)
! 				p = strchr(p, ':');
! 			else
! 				p = NULL;
! 
  			if (p == NULL || strlen(p) <= 1)
  				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
  
! 			p++;				/* remove '/' or ':' char */
  			cluster->controldata.chkpnt_nxtxid = str2uint(p);
  			got_xid = true;
  		}

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 412c845..6c50f79 100644
*** a/doc/src/sgml/catalogs.sgml
--- b/doc/src/sgml/catalogs.sgml
***************
*** 7350,7355 ****
--- 7350,7360 ----
       </row>
  
       <row>
+       <entry><link linkend="view-pg-config"><structname>pg_config</structname></link></entry>
+       <entry>compile-time configuration parameters</entry>
+      </row>
+ 
+      <row>
        <entry><link linkend="view-pg-cursors"><structname>pg_cursors</structname></link></entry>
        <entry>open cursors</entry>
       </row>
***************
*** 7609,7614 ****
--- 7614,7667 ----
    </para>
   </sect1>
  
+  <sect1 id="view-pg-config">
+   <title><structname>pg_config</structname></title>
+ 
+   <indexterm zone="view-pg-config">
+    <primary>pg_config</primary>
+   </indexterm>
+ 
+   <para>
+    The view <structname>pg_config</structname> describes the
+    compile-time configuration parameters of the currently installed
+    version of PostgreSQL. It is intended, for example, to be used by
+    software packages that want to interface to PostgreSQL to facilitate
+    finding the required header files and libraries. It provides the same
+    basic information as the <xref linkend="app-pgconfig"> PostgreSQL Client
+    Application. There is a System Information Function
+    (<xref linkend="functions-info">) called <function>pg_config</function>
+    which underlies this view.
+   </para>
+ 
+   <table>
+    <title><structname>pg_config</> Columns</title>
+    <tgroup cols="3">
+     <thead>
+      <row>
+       <entry>Name</entry>
+       <entry>Type</entry>
+       <entry>Description</entry>
+      </row>
+     </thead>
+ 
+     <tbody>
+      <row>
+       <entry><structfield>name</structfield></entry>
+       <entry><type>text</type></entry>
+       <entry>The parameter name</entry>
+      </row>
+ 
+      <row>
+       <entry><structfield>setting</structfield></entry>
+       <entry><type>text</type></entry>
+       <entry>The parameter value</entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </table>
+ 
+  </sect1>
+ 
   <sect1 id="view-pg-cursors">
    <title><structname>pg_cursors</structname></title>
  
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f9eea76..29c36d2 100644
*** a/doc/src/sgml/func.sgml
--- b/doc/src/sgml/func.sgml
*************** SELECT * FROM pg_ls_dir('.') WITH ORDINA
*** 15003,15008 ****
--- 15003,15014 ----
        </row>
  
        <row>
+        <entry><literal><function>pg_config()</function></literal></entry>
+        <entry><type>setof record</type></entry>
+        <entry>get list of compile-time configure variable names and their values</entry>
+       </row>
+ 
+       <row>
         <entry><literal><function>pg_is_other_temp_schema(<type>oid</type>)</function></literal></entry>
         <entry><type>boolean</type></entry>
         <entry>is schema another session's temporary schema?</entry>
*************** SET search_path TO <replaceable>schema</
*** 15245,15250 ****
--- 15251,15273 ----
     </para>
  
     <indexterm>
+     <primary>pg_config</primary>
+    </indexterm>
+ 
+    <para>
+     <function>pg_config</function> returns a set of records describing the
+     compile-time configuration parameters of the currently installed
+     version of PostgreSQL. It is intended, for example, to be used by
+     software packages that want to interface to PostgreSQL to facilitate
+     finding the required header files and libraries. The
+     <structfield>name</> column contains the parameter name.
+     The <structfield>setting</> column contains the parameter value. It
+     provides the same basic information as the
+     <xref linkend="app-pgconfig"> PostgreSQL Client Application. There
+     is also a <xref linkend="view-pg-config"> system view.
+    </para>
+ 
+    <indexterm>
      <primary>version</primary>
     </indexterm>
  
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 923fe58..abf9a70 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 433,438 ****
--- 433,444 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
+ REVOKE ALL on pg_config FROM PUBLIC;
+ REVOKE EXECUTE ON FUNCTION pg_config() FROM PUBLIC;
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..a0c82c1 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,21 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...a74e97d .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,102 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_config.c
+  *
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "common/config_info.h"
+ #include "utils/builtins.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	ConfigData		   *configdata;
+ 	size_t				configdata_len;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	configdata = get_configdata(my_exec_path, &configdata_len);
+ 	for (i = 0; i < configdata_len; i++)
+ 	{
+ 		values[0] = configdata[i].name;
+ 		values[1] = configdata[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 	}
+ 
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index 812c4a1..26fbaad 100644
*** a/src/bin/pg_config/Makefile
--- b/src/bin/pg_config/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 17,36 ****
  
  OBJS=   pg_config.o $(WIN32RES)
  
- # don't include subdirectory-path-dependent -I and -L switches
- STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
- 
- override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
- override CPPFLAGS += -DVAL_CC="\"$(CC)\""
- override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
- override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
- override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
- 
  all: pg_config
  
  pg_config: $(OBJS) | submake-libpgport
--- 17,22 ----
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 4b14294..23c0495 100644
*** a/src/bin/pg_config/pg_config.c
--- b/src/bin/pg_config/pg_config.c
***************
*** 25,387 ****
  #include "postgres_fe.h"
  
  #include "port.h"
  
  static const char *progname;
- static char mypath[MAXPGPATH];
- 
- 
- /*
-  * This function cleans up the paths for use with either cmd.exe or Msys
-  * on Windows. We need them to use filenames without spaces, for which a
-  * short filename is the safest equivalent, eg:
-  *		C:/Progra~1/
-  */
- static void
- cleanup_path(char *path)
- {
- #ifdef WIN32
- 	char	   *ptr;
- 
- 	/*
- 	 * GetShortPathName() will fail if the path does not exist, or short names
- 	 * are disabled on this file system.  In both cases, we just return the
- 	 * original path.  This is particularly useful for --sysconfdir, which
- 	 * might not exist.
- 	 */
- 	GetShortPathName(path, path, MAXPGPATH - 1);
- 
- 	/* Replace '\' with '/' */
- 	for (ptr = path; *ptr; ptr++)
- 	{
- 		if (*ptr == '\\')
- 			*ptr = '/';
- 	}
- #endif
- }
- 
- 
- /*
-  * For each piece of information known to pg_config, we define a subroutine
-  * to print it.  This is probably overkill, but it avoids code duplication
-  * and accidentally omitting items from the "all" display.
-  */
- 
- static void
- show_bindir(bool all)
- {
- 	char		path[MAXPGPATH];
- 	char	   *lastsep;
- 
- 	if (all)
- 		printf("BINDIR = ");
- 	/* assume we are located in the bindir */
- 	strcpy(path, mypath);
- 	lastsep = strrchr(path, '/');
- 
- 	if (lastsep)
- 		*lastsep = '\0';
- 
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_docdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("DOCDIR = ");
- 	get_doc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_htmldir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("HTMLDIR = ");
- 	get_html_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR = ");
- 	get_include_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkgincludedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGINCLUDEDIR = ");
- 	get_pkginclude_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir_server(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR-SERVER = ");
- 	get_includeserver_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_libdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LIBDIR = ");
- 	get_lib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkglibdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGLIBDIR = ");
- 	get_pkglib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_localedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LOCALEDIR = ");
- 	get_locale_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_mandir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("MANDIR = ");
- 	get_man_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sharedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SHAREDIR = ");
- 	get_share_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sysconfdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SYSCONFDIR = ");
- 	get_etc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pgxs(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PGXS = ");
- 	get_pkglib_path(mypath, path);
- 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_configure(bool all)
- {
- #ifdef VAL_CONFIGURE
- 	if (all)
- 		printf("CONFIGURE = ");
- 	printf("%s\n", VAL_CONFIGURE);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cc(bool all)
- {
- #ifdef VAL_CC
- 	if (all)
- 		printf("CC = ");
- 	printf("%s\n", VAL_CC);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cppflags(bool all)
- {
- #ifdef VAL_CPPFLAGS
- 	if (all)
- 		printf("CPPFLAGS = ");
- 	printf("%s\n", VAL_CPPFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags(bool all)
- {
- #ifdef VAL_CFLAGS
- 	if (all)
- 		printf("CFLAGS = ");
- 	printf("%s\n", VAL_CFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags_sl(bool all)
- {
- #ifdef VAL_CFLAGS_SL
- 	if (all)
- 		printf("CFLAGS_SL = ");
- 	printf("%s\n", VAL_CFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags(bool all)
- {
- #ifdef VAL_LDFLAGS
- 	if (all)
- 		printf("LDFLAGS = ");
- 	printf("%s\n", VAL_LDFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_ex(bool all)
- {
- #ifdef VAL_LDFLAGS_EX
- 	if (all)
- 		printf("LDFLAGS_EX = ");
- 	printf("%s\n", VAL_LDFLAGS_EX);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_sl(bool all)
- {
- #ifdef VAL_LDFLAGS_SL
- 	if (all)
- 		printf("LDFLAGS_SL = ");
- 	printf("%s\n", VAL_LDFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_libs(bool all)
- {
- #ifdef VAL_LIBS
- 	if (all)
- 		printf("LIBS = ");
- 	printf("%s\n", VAL_LIBS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_version(bool all)
- {
- 	if (all)
- 		printf("VERSION = ");
- 	printf("PostgreSQL " PG_VERSION "\n");
- }
- 
  
  /*
   * Table of known information items
--- 25,33 ----
  #include "postgres_fe.h"
  
  #include "port.h"
+ #include "common/config_info.h"
  
  static const char *progname;
  
  /*
   * Table of known information items
*************** show_version(bool all)
*** 391,423 ****
  typedef struct
  {
  	const char *switchname;
! 	void		(*show_func) (bool all);
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", show_bindir},
! 	{"--docdir", show_docdir},
! 	{"--htmldir", show_htmldir},
! 	{"--includedir", show_includedir},
! 	{"--pkgincludedir", show_pkgincludedir},
! 	{"--includedir-server", show_includedir_server},
! 	{"--libdir", show_libdir},
! 	{"--pkglibdir", show_pkglibdir},
! 	{"--localedir", show_localedir},
! 	{"--mandir", show_mandir},
! 	{"--sharedir", show_sharedir},
! 	{"--sysconfdir", show_sysconfdir},
! 	{"--pgxs", show_pgxs},
! 	{"--configure", show_configure},
! 	{"--cc", show_cc},
! 	{"--cppflags", show_cppflags},
! 	{"--cflags", show_cflags},
! 	{"--cflags_sl", show_cflags_sl},
! 	{"--ldflags", show_ldflags},
! 	{"--ldflags_ex", show_ldflags_ex},
! 	{"--ldflags_sl", show_ldflags_sl},
! 	{"--libs", show_libs},
! 	{"--version", show_version},
  	{NULL, NULL}
  };
  
--- 37,69 ----
  typedef struct
  {
  	const char *switchname;
! 	const char *configname;
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", "BINDIR"},
! 	{"--docdir", "DOCDIR"},
! 	{"--htmldir", "HTMLDIR"},
! 	{"--includedir", "INCLUDEDIR"},
! 	{"--pkgincludedir", "PKGINCLUDEDIR"},
! 	{"--includedir-server", "INCLUDEDIR-SERVER"},
! 	{"--libdir", "LIBDIR"},
! 	{"--pkglibdir", "PKGLIBDIR"},
! 	{"--localedir", "LOCALEDIR"},
! 	{"--mandir", "MANDIR"},
! 	{"--sharedir", "SHAREDIR"},
! 	{"--sysconfdir", "SYSCONFDIR"},
! 	{"--pgxs", "PGXS"},
! 	{"--configure", "CONFIGURE"},
! 	{"--cc", "CC"},
! 	{"--cppflags", "CPPFLAGS"},
! 	{"--cflags", "CFLAGS"},
! 	{"--cflags_sl", "CFLAGS_SL"},
! 	{"--ldflags", "LDFLAGS"},
! 	{"--ldflags_ex", "LDFLAGS_EX"},
! 	{"--ldflags_sl", "LDFLAGS_SL"},
! 	{"--libs", "LIBS"},
! 	{"--version", "VERSION"},
  	{NULL, NULL}
  };
  
*************** advice(void)
*** 466,487 ****
  }
  
  static void
! show_all(void)
  {
  	int			i;
  
! 	for (i = 0; info_items[i].switchname != NULL; i++)
  	{
! 		(*info_items[i].show_func) (true);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
  	int			i;
  	int			j;
- 	int			ret;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
--- 112,138 ----
  }
  
  static void
! show_item(const char *configname,
! 		  ConfigData *configdata,
! 		  size_t configdata_len)
  {
  	int			i;
  
! 	for (i = 0; i < configdata_len; i++)
  	{
! 		if (strcmp(configname, configdata[i].name) == 0)
! 			printf("%s = %s\n", configdata[i].name, configdata[i].setting);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
+ 	ConfigData *configdata;
+ 	size_t		configdata_len;
+ 	char		my_exec_path[MAXPGPATH];
  	int			i;
  	int			j;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
*************** main(int argc, char **argv)
*** 497,524 ****
  		}
  	}
  
! 	ret = find_my_exec(argv[0], mypath);
! 
! 	if (ret)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		show_all();
  		exit(0);
  	}
  
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				(*info_items[j].show_func) (false);
  				break;
  			}
  		}
--- 148,177 ----
  		}
  	}
  
! 	if (find_my_exec(argv[0], my_exec_path) < 0)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
+ 	configdata = get_configdata(my_exec_path, &configdata_len);
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		for (i = 0; i < configdata_len; i++)
! 			printf("%s = %s\n", configdata[i].name, configdata[i].setting);
  		exit(0);
  	}
  
+ 	/* otherwise print requested items */
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				show_item(info_items[j].configname,
! 						  configdata, configdata_len);
  				break;
  			}
  		}
diff --git a/src/common/Makefile b/src/common/Makefile
index c47445e..ab183cf 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 23,30 ****
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! OBJS_COMMON = exec.o pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
! 	rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 23,43 ----
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS_COMMON = exec.o config_info.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
*************** libpgcommon_srv.a: $(OBJS_SRV)
*** 61,67 ****
  # a hack that might fail someday if there is a *_srv.o without a
  # corresponding *.o, but it works for now.
  %_srv.o: %.c %.o
! 	$(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
  
  $(OBJS_SRV): | submake-errcodes
  
--- 74,80 ----
  # a hack that might fail someday if there is a *_srv.o without a
  # corresponding *.o, but it works for now.
  %_srv.o: %.c %.o
! 	$(CC) $(CFLAGS) $(subst -DFRONTEND ,, $(CPPFLAGS)) -c $< -o $@
  
  $(OBJS_SRV): | submake-errcodes
  
diff --git a/src/common/config_info.c b/src/common/config_info.c
index ...1e3c6db .
*** a/src/common/config_info.c
--- b/src/common/config_info.c
***************
*** 0 ****
--- 1,206 ----
+ /*-------------------------------------------------------------------------
+  *
+  * config_info.c
+  *		Common code for pg_config output
+  *
+  *
+  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *
+  * IDENTIFICATION
+  *	  src/common/controldata_utils.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ #ifndef FRONTEND
+ #include "postgres.h"
+ #else
+ #include "postgres_fe.h"
+ #endif
+ 
+ #include "miscadmin.h"
+ #include "common/config_info.h"
+ 
+ static size_t configdata_names_len(void);
+ 
+ static const char *const configdata_names[] =
+ {
+ 	"BINDIR",
+ 	"DOCDIR",
+ 	"HTMLDIR",
+ 	"INCLUDEDIR",
+ 	"PKGINCLUDEDIR",
+ 	"INCLUDEDIR-SERVER",
+ 	"LIBDIR",
+ 	"PKGLIBDIR",
+ 	"LOCALEDIR",
+ 	"MANDIR",
+ 	"SHAREDIR",
+ 	"SYSCONFDIR",
+ 	"PGXS",
+ 	"CONFIGURE",
+ 	"CC",
+ 	"CPPFLAGS",
+ 	"CFLAGS",
+ 	"CFLAGS_SL",
+ 	"LDFLAGS",
+ 	"LDFLAGS_EX",
+ 	"LDFLAGS_SL",
+ 	"LIBS",
+ 	"VERSION",
+ 	NULL
+ };
+ 
+ static size_t
+ configdata_names_len(void)
+ {
+ 	size_t	i = 0;
+ 
+ 	while (configdata_names[i])
+ 		i++;
+ 
+ 	return i;
+ }
+ 
+ /*
+  * get_configdata(char *my_exec_path, size_t *configdata_len)
+  *
+  * Get configure-time constants. The caller is responsible
+  * for pfreeing the result.
+  */
+ ConfigData *
+ get_configdata(char *my_exec_path, size_t *configdata_len)
+ {
+ 	ConfigData	   *configdata;
+ 	char			path[MAXPGPATH];
+ 	char		   *lastsep;
+ 	int				i;
+ 
+ 	*configdata_len = configdata_names_len();
+ 	configdata = palloc(*configdata_len * sizeof(ConfigData));
+ 
+ 	/*
+ 	 * initialize configdata names
+ 	 *
+ 	 * These better be in sync with the settings manually
+ 	 * defined below.
+ 	 */
+ 	for (i = 0; i < *configdata_len; i++)
+ 		configdata[i].name = pstrdup(configdata_names[i]);
+ 
+ 	strcpy(path, my_exec_path);
+ 	lastsep = strrchr(path, '/');
+ 	if (lastsep)
+ 		*lastsep = '\0';
+ 	cleanup_path(path);
+ 	configdata[0].setting = pstrdup(path);
+ 
+ 	get_doc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[1].setting = pstrdup(path);
+ 
+ 	get_html_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[2].setting = pstrdup(path);
+ 
+ 	get_include_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[3].setting = pstrdup(path);
+ 
+ 	get_pkginclude_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[4].setting = pstrdup(path);
+ 
+ 	get_includeserver_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[5].setting = pstrdup(path);
+ 
+ 	get_lib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[6].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[7].setting = pstrdup(path);
+ 
+ 	get_locale_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[8].setting = pstrdup(path);
+ 
+ 	get_man_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[9].setting = pstrdup(path);
+ 
+ 	get_share_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[10].setting = pstrdup(path);
+ 
+ 	get_etc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[11].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ 	cleanup_path(path);
+ 	configdata[12].setting = pstrdup(path);
+ 
+ #ifdef VAL_CONFIGURE
+ 	configdata[13].setting = pstrdup(VAL_CONFIGURE);
+ #else
+ 	configdata[13].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CC
+ 	configdata[14].setting = pstrdup(VAL_CC);
+ #else
+ 	configdata[14].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CPPFLAGS
+ 	configdata[15].setting = pstrdup(VAL_CPPFLAGS);
+ #else
+ 	configdata[15].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS
+ 	configdata[16].setting = pstrdup(VAL_CFLAGS);
+ #else
+ 	configdata[16].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS_SL
+ 	configdata[17].setting = pstrdup(VAL_CFLAGS_SL);
+ #else
+ 	configdata[17].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS
+ 	configdata[18].setting = pstrdup(VAL_LDFLAGS);
+ #else
+ 	configdata[18].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_EX
+ 	configdata[19].setting = pstrdup(VAL_LDFLAGS_EX);
+ #else
+ 	configdata[19].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_SL
+ 	configdata[20].setting = pstrdup(VAL_LDFLAGS_SL);
+ #else
+ 	configdata[20].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LIBS
+ 	configdata[21].setting = pstrdup(VAL_LIBS);
+ #else
+ 	configdata[21].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ 	configdata[22].setting = pstrdup("PostgreSQL " PG_VERSION);
+ 
+ 	return configdata;
+ }
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 1c0ef9a..f4c9572 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("get an individual replication ori
*** 5202,5207 ****
--- 5202,5210 ----
  DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v r 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
  DESCR("get progress for all replication origins");
  
+ /* pg_config */
+ DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
  
  /*
   * Symbolic values for provolatile column: these indicate whether the result
diff --git a/src/include/common/config_info.h b/src/include/common/config_info.h
index ...488fcf1 .
*** a/src/include/common/config_info.h
--- b/src/include/common/config_info.h
***************
*** 0 ****
--- 1,21 ----
+ /*
+  * controldata_utils.h
+  *		Common code for pg_controldata output
+  *
+  *	Copyright (c) 2016, PostgreSQL Global Development Group
+  *
+  *	src/include/common/controldata_utils.h
+  */
+ #ifndef COMMON_CONFIG_INFO_H
+ #define COMMON_CONFIG_INFO_H
+ 
+ typedef struct ConfigData
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ } ConfigData;
+ 
+ extern ConfigData *get_configdata(char *my_exec_path,
+ 								  size_t *configdata_len);
+ 
+ #endif   /* COMMON_CONFIG_INFO_H */
diff --git a/src/include/port.h b/src/include/port.h
index 9fc79f4..cb13dd8 100644
*** a/src/include/port.h
--- b/src/include/port.h
*************** extern void join_path_components(char *r
*** 42,47 ****
--- 42,48 ----
  					 const char *head, const char *tail);
  extern void canonicalize_path(char *path);
  extern void make_native_path(char *path);
+ extern void cleanup_path(char *path);
  extern bool path_contains_parent_reference(const char *path);
  extern bool path_is_relative_and_below_cwd(const char *path);
  extern bool path_is_prefix_of_path(const char *path1, const char *path2);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index affcc01..a784de9 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1147,1152 ****
--- 1147,1155 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/port/path.c b/src/port/path.c
index a418f93..5c9de0c 100644
*** a/src/port/path.c
--- b/src/port/path.c
*************** make_native_path(char *filename)
*** 172,177 ****
--- 172,207 ----
  
  
  /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ 
+ /*
   * join_path_components - join two path components, inserting a slash
   *
   * We omit the slash if either given component is empty.
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 2bdba2d..81bc5c9 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1313 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 1dba7d9..cc0dcb3 100644
*** a/src/tools/msvc/Mkvcbuild.pm
--- b/src/tools/msvc/Mkvcbuild.pm
*************** sub mkvcbuild
*** 106,113 ****
  	}
  
  	our @pgcommonallfiles = qw(
! 	  exec.c pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c
! 	  string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c
--- 106,113 ----
  	}
  
  	our @pgcommonallfiles = qw(
! 	  exec.c config_info.c pg_lzcompress.c pgfnames.c psprintf.c
! 	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 412c845..7b71768 100644
*** a/doc/src/sgml/catalogs.sgml
--- b/doc/src/sgml/catalogs.sgml
***************
*** 7350,7355 ****
--- 7350,7360 ----
       </row>
  
       <row>
+       <entry><link linkend="view-pg-config"><structname>pg_config</structname></link></entry>
+       <entry>compile-time configuration parameters</entry>
+      </row>
+ 
+      <row>
        <entry><link linkend="view-pg-cursors"><structname>pg_cursors</structname></link></entry>
        <entry>open cursors</entry>
       </row>
***************
*** 7609,7614 ****
--- 7614,7668 ----
    </para>
   </sect1>
  
+  <sect1 id="view-pg-config">
+   <title><structname>pg_config</structname></title>
+ 
+   <indexterm zone="view-pg-config">
+    <primary>pg_config</primary>
+   </indexterm>
+ 
+   <para>
+    The view <structname>pg_config</structname> describes the
+    compile-time configuration parameters of the currently installed
+    version of <productname>PostgreSQL</>. It is intended, for example, to
+    be used by software packages that want to interface to
+    <productname>PostgreSQL</> to facilitate finding the required header
+    files and libraries. It provides the same basic information as the
+    <xref linkend="app-pgconfig"> <productname>PostgreSQL</> Client
+    Application. There is a System Information Function
+    (<xref linkend="functions-info">) called <function>pg_config</function>
+    which underlies this view.
+   </para>
+ 
+   <table>
+    <title><structname>pg_config</> Columns</title>
+    <tgroup cols="3">
+     <thead>
+      <row>
+       <entry>Name</entry>
+       <entry>Type</entry>
+       <entry>Description</entry>
+      </row>
+     </thead>
+ 
+     <tbody>
+      <row>
+       <entry><structfield>name</structfield></entry>
+       <entry><type>text</type></entry>
+       <entry>The parameter name</entry>
+      </row>
+ 
+      <row>
+       <entry><structfield>setting</structfield></entry>
+       <entry><type>text</type></entry>
+       <entry>The parameter value</entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </table>
+ 
+  </sect1>
+ 
   <sect1 id="view-pg-cursors">
    <title><structname>pg_cursors</structname></title>
  
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f9eea76..0e17ca3 100644
*** a/doc/src/sgml/func.sgml
--- b/doc/src/sgml/func.sgml
*************** SELECT * FROM pg_ls_dir('.') WITH ORDINA
*** 15003,15008 ****
--- 15003,15014 ----
        </row>
  
        <row>
+        <entry><literal><function>pg_config()</function></literal></entry>
+        <entry><type>setof record</type></entry>
+        <entry>get list of compile-time configure variable names and their values</entry>
+       </row>
+ 
+       <row>
         <entry><literal><function>pg_is_other_temp_schema(<type>oid</type>)</function></literal></entry>
         <entry><type>boolean</type></entry>
         <entry>is schema another session's temporary schema?</entry>
*************** SET search_path TO <replaceable>schema</
*** 15245,15250 ****
--- 15251,15274 ----
     </para>
  
     <indexterm>
+     <primary>pg_config</primary>
+    </indexterm>
+ 
+    <para>
+     <function>pg_config</function> returns a set of records describing the
+     compile-time configuration parameters of the currently installed
+     version of <productname>PostgreSQL</>. It is intended, for example, to
+     be used by software packages that want to interface to
+     <productname>PostgreSQL</> to facilitate finding the required header
+     files and libraries. The <structfield>name</> column contains the
+     parameter name. The <structfield>setting</> column contains the
+     parameter value. It provides the same basic information as the
+     <xref linkend="app-pgconfig"> <productname>PostgreSQL</> Client
+     Application. There is also a <xref linkend="view-pg-config"> system
+     view.
+    </para>
+ 
+    <indexterm>
      <primary>version</primary>
     </indexterm>
  
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 923fe58..abf9a70 100644
*** a/src/backend/catalog/system_views.sql
--- b/src/backend/catalog/system_views.sql
*************** CREATE VIEW pg_timezone_abbrevs AS
*** 433,438 ****
--- 433,444 ----
  CREATE VIEW pg_timezone_names AS
      SELECT * FROM pg_timezone_names();
  
+ CREATE VIEW pg_config AS
+     SELECT * FROM pg_config();
+ 
+ REVOKE ALL on pg_config FROM PUBLIC;
+ REVOKE EXECUTE ON FUNCTION pg_config() FROM PUBLIC;
+ 
  -- Statistics views
  
  CREATE VIEW pg_stat_all_tables AS
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 7889101..a0c82c1 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,21 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
!        sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
--- 14,21 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
!        ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
  # we can't subsitute it into pg_config.h.
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index ...3d6b9f2 .
*** a/src/backend/utils/misc/pg_config.c
--- b/src/backend/utils/misc/pg_config.c
***************
*** 0 ****
--- 1,103 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_config.c
+  *		Expose same output as pg_config except as an SRF
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_config.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "catalog/pg_type.h"
+ #include "common/config_info.h"
+ #include "utils/builtins.h"
+ #include "utils/elog.h"
+ #include "port.h"
+ 
+ Datum
+ pg_config(PG_FUNCTION_ARGS)
+ {
+ 	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+ 	Tuplestorestate	   *tupstore;
+ 	HeapTuple			tuple;
+ 	TupleDesc			tupdesc;
+ 	AttInMetadata	   *attinmeta;
+ 	MemoryContext		per_query_ctx;
+ 	MemoryContext		oldcontext;
+ 	ConfigData		   *configdata;
+ 	size_t				configdata_len;
+ 	char			   *values[2];
+ 	int					i = 0;
+ 
+ 	/* check to see if caller supports us returning a tuplestore */
+ 	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("materialize mode required, but it is not "
+ 						"allowed in this context")));
+ 
+ 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+ 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+ 
+ 	/* get the requested return tuple description */
+ 	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+ 
+ 	/*
+ 	 * Check to make sure we have a reasonable tuple descriptor
+ 	 */
+ 	if (tupdesc->natts != 2 ||
+ 		tupdesc->attrs[0]->atttypid != TEXTOID ||
+ 		tupdesc->attrs[1]->atttypid != TEXTOID)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_SYNTAX_ERROR),
+ 				 errmsg("query-specified return tuple and "
+ 						"function return type are not compatible")));
+ 
+ 	/* OK to use it */
+ 	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+ 
+ 	/* let the caller know we're sending back a tuplestore */
+ 	rsinfo->returnMode = SFRM_Materialize;
+ 
+ 	/* initialize our tuplestore */
+ 	tupstore = tuplestore_begin_heap(true, false, work_mem);
+ 
+ 	configdata = get_configdata(my_exec_path, &configdata_len);
+ 	for (i = 0; i < configdata_len; i++)
+ 	{
+ 		values[0] = configdata[i].name;
+ 		values[1] = configdata[i].setting;
+ 
+ 		tuple = BuildTupleFromCStrings(attinmeta, values);
+ 		tuplestore_puttuple(tupstore, tuple);
+ 	}
+ 
+ 	/*
+ 	 * no longer need the tuple descriptor reference created by
+ 	 * TupleDescGetAttInMetadata()
+ 	 */
+ 	ReleaseTupleDesc(tupdesc);
+ 
+ 	tuplestore_donestoring(tupstore);
+ 	rsinfo->setResult = tupstore;
+ 
+ 	/*
+ 	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+ 	 * tuples are in our tuplestore and passed back through
+ 	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+ 	 * that we actually used to build our tuples with, so the caller can
+ 	 * verify we did what it was expecting.
+ 	 */
+ 	rsinfo->setDesc = tupdesc;
+ 	MemoryContextSwitchTo(oldcontext);
+ 
+ 	return (Datum) 0;
+ }
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index 812c4a1..26fbaad 100644
*** a/src/bin/pg_config/Makefile
--- b/src/bin/pg_config/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 17,36 ****
  
  OBJS=   pg_config.o $(WIN32RES)
  
- # don't include subdirectory-path-dependent -I and -L switches
- STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
- 
- override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
- override CPPFLAGS += -DVAL_CC="\"$(CC)\""
- override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
- override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
- override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
- 
  all: pg_config
  
  pg_config: $(OBJS) | submake-libpgport
--- 17,22 ----
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 4b14294..23c0495 100644
*** a/src/bin/pg_config/pg_config.c
--- b/src/bin/pg_config/pg_config.c
***************
*** 25,387 ****
  #include "postgres_fe.h"
  
  #include "port.h"
  
  static const char *progname;
- static char mypath[MAXPGPATH];
- 
- 
- /*
-  * This function cleans up the paths for use with either cmd.exe or Msys
-  * on Windows. We need them to use filenames without spaces, for which a
-  * short filename is the safest equivalent, eg:
-  *		C:/Progra~1/
-  */
- static void
- cleanup_path(char *path)
- {
- #ifdef WIN32
- 	char	   *ptr;
- 
- 	/*
- 	 * GetShortPathName() will fail if the path does not exist, or short names
- 	 * are disabled on this file system.  In both cases, we just return the
- 	 * original path.  This is particularly useful for --sysconfdir, which
- 	 * might not exist.
- 	 */
- 	GetShortPathName(path, path, MAXPGPATH - 1);
- 
- 	/* Replace '\' with '/' */
- 	for (ptr = path; *ptr; ptr++)
- 	{
- 		if (*ptr == '\\')
- 			*ptr = '/';
- 	}
- #endif
- }
- 
- 
- /*
-  * For each piece of information known to pg_config, we define a subroutine
-  * to print it.  This is probably overkill, but it avoids code duplication
-  * and accidentally omitting items from the "all" display.
-  */
- 
- static void
- show_bindir(bool all)
- {
- 	char		path[MAXPGPATH];
- 	char	   *lastsep;
- 
- 	if (all)
- 		printf("BINDIR = ");
- 	/* assume we are located in the bindir */
- 	strcpy(path, mypath);
- 	lastsep = strrchr(path, '/');
- 
- 	if (lastsep)
- 		*lastsep = '\0';
- 
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_docdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("DOCDIR = ");
- 	get_doc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_htmldir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("HTMLDIR = ");
- 	get_html_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR = ");
- 	get_include_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkgincludedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGINCLUDEDIR = ");
- 	get_pkginclude_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_includedir_server(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("INCLUDEDIR-SERVER = ");
- 	get_includeserver_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_libdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LIBDIR = ");
- 	get_lib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pkglibdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PKGLIBDIR = ");
- 	get_pkglib_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_localedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("LOCALEDIR = ");
- 	get_locale_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_mandir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("MANDIR = ");
- 	get_man_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sharedir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SHAREDIR = ");
- 	get_share_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_sysconfdir(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("SYSCONFDIR = ");
- 	get_etc_path(mypath, path);
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_pgxs(bool all)
- {
- 	char		path[MAXPGPATH];
- 
- 	if (all)
- 		printf("PGXS = ");
- 	get_pkglib_path(mypath, path);
- 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
- 	cleanup_path(path);
- 	printf("%s\n", path);
- }
- 
- static void
- show_configure(bool all)
- {
- #ifdef VAL_CONFIGURE
- 	if (all)
- 		printf("CONFIGURE = ");
- 	printf("%s\n", VAL_CONFIGURE);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cc(bool all)
- {
- #ifdef VAL_CC
- 	if (all)
- 		printf("CC = ");
- 	printf("%s\n", VAL_CC);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cppflags(bool all)
- {
- #ifdef VAL_CPPFLAGS
- 	if (all)
- 		printf("CPPFLAGS = ");
- 	printf("%s\n", VAL_CPPFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags(bool all)
- {
- #ifdef VAL_CFLAGS
- 	if (all)
- 		printf("CFLAGS = ");
- 	printf("%s\n", VAL_CFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_cflags_sl(bool all)
- {
- #ifdef VAL_CFLAGS_SL
- 	if (all)
- 		printf("CFLAGS_SL = ");
- 	printf("%s\n", VAL_CFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags(bool all)
- {
- #ifdef VAL_LDFLAGS
- 	if (all)
- 		printf("LDFLAGS = ");
- 	printf("%s\n", VAL_LDFLAGS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_ex(bool all)
- {
- #ifdef VAL_LDFLAGS_EX
- 	if (all)
- 		printf("LDFLAGS_EX = ");
- 	printf("%s\n", VAL_LDFLAGS_EX);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_ldflags_sl(bool all)
- {
- #ifdef VAL_LDFLAGS_SL
- 	if (all)
- 		printf("LDFLAGS_SL = ");
- 	printf("%s\n", VAL_LDFLAGS_SL);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_libs(bool all)
- {
- #ifdef VAL_LIBS
- 	if (all)
- 		printf("LIBS = ");
- 	printf("%s\n", VAL_LIBS);
- #else
- 	if (!all)
- 	{
- 		fprintf(stderr, _("not recorded\n"));
- 		exit(1);
- 	}
- #endif
- }
- 
- static void
- show_version(bool all)
- {
- 	if (all)
- 		printf("VERSION = ");
- 	printf("PostgreSQL " PG_VERSION "\n");
- }
- 
  
  /*
   * Table of known information items
--- 25,33 ----
  #include "postgres_fe.h"
  
  #include "port.h"
+ #include "common/config_info.h"
  
  static const char *progname;
  
  /*
   * Table of known information items
*************** show_version(bool all)
*** 391,423 ****
  typedef struct
  {
  	const char *switchname;
! 	void		(*show_func) (bool all);
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", show_bindir},
! 	{"--docdir", show_docdir},
! 	{"--htmldir", show_htmldir},
! 	{"--includedir", show_includedir},
! 	{"--pkgincludedir", show_pkgincludedir},
! 	{"--includedir-server", show_includedir_server},
! 	{"--libdir", show_libdir},
! 	{"--pkglibdir", show_pkglibdir},
! 	{"--localedir", show_localedir},
! 	{"--mandir", show_mandir},
! 	{"--sharedir", show_sharedir},
! 	{"--sysconfdir", show_sysconfdir},
! 	{"--pgxs", show_pgxs},
! 	{"--configure", show_configure},
! 	{"--cc", show_cc},
! 	{"--cppflags", show_cppflags},
! 	{"--cflags", show_cflags},
! 	{"--cflags_sl", show_cflags_sl},
! 	{"--ldflags", show_ldflags},
! 	{"--ldflags_ex", show_ldflags_ex},
! 	{"--ldflags_sl", show_ldflags_sl},
! 	{"--libs", show_libs},
! 	{"--version", show_version},
  	{NULL, NULL}
  };
  
--- 37,69 ----
  typedef struct
  {
  	const char *switchname;
! 	const char *configname;
  } InfoItem;
  
  static const InfoItem info_items[] = {
! 	{"--bindir", "BINDIR"},
! 	{"--docdir", "DOCDIR"},
! 	{"--htmldir", "HTMLDIR"},
! 	{"--includedir", "INCLUDEDIR"},
! 	{"--pkgincludedir", "PKGINCLUDEDIR"},
! 	{"--includedir-server", "INCLUDEDIR-SERVER"},
! 	{"--libdir", "LIBDIR"},
! 	{"--pkglibdir", "PKGLIBDIR"},
! 	{"--localedir", "LOCALEDIR"},
! 	{"--mandir", "MANDIR"},
! 	{"--sharedir", "SHAREDIR"},
! 	{"--sysconfdir", "SYSCONFDIR"},
! 	{"--pgxs", "PGXS"},
! 	{"--configure", "CONFIGURE"},
! 	{"--cc", "CC"},
! 	{"--cppflags", "CPPFLAGS"},
! 	{"--cflags", "CFLAGS"},
! 	{"--cflags_sl", "CFLAGS_SL"},
! 	{"--ldflags", "LDFLAGS"},
! 	{"--ldflags_ex", "LDFLAGS_EX"},
! 	{"--ldflags_sl", "LDFLAGS_SL"},
! 	{"--libs", "LIBS"},
! 	{"--version", "VERSION"},
  	{NULL, NULL}
  };
  
*************** advice(void)
*** 466,487 ****
  }
  
  static void
! show_all(void)
  {
  	int			i;
  
! 	for (i = 0; info_items[i].switchname != NULL; i++)
  	{
! 		(*info_items[i].show_func) (true);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
  	int			i;
  	int			j;
- 	int			ret;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
--- 112,138 ----
  }
  
  static void
! show_item(const char *configname,
! 		  ConfigData *configdata,
! 		  size_t configdata_len)
  {
  	int			i;
  
! 	for (i = 0; i < configdata_len; i++)
  	{
! 		if (strcmp(configname, configdata[i].name) == 0)
! 			printf("%s = %s\n", configdata[i].name, configdata[i].setting);
  	}
  }
  
  int
  main(int argc, char **argv)
  {
+ 	ConfigData *configdata;
+ 	size_t		configdata_len;
+ 	char		my_exec_path[MAXPGPATH];
  	int			i;
  	int			j;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_config"));
  
*************** main(int argc, char **argv)
*** 497,524 ****
  		}
  	}
  
! 	ret = find_my_exec(argv[0], mypath);
! 
! 	if (ret)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		show_all();
  		exit(0);
  	}
  
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				(*info_items[j].show_func) (false);
  				break;
  			}
  		}
--- 148,177 ----
  		}
  	}
  
! 	if (find_my_exec(argv[0], my_exec_path) < 0)
  	{
  		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  		exit(1);
  	}
  
+ 	configdata = get_configdata(my_exec_path, &configdata_len);
  	/* no arguments -> print everything */
  	if (argc < 2)
  	{
! 		for (i = 0; i < configdata_len; i++)
! 			printf("%s = %s\n", configdata[i].name, configdata[i].setting);
  		exit(0);
  	}
  
+ 	/* otherwise print requested items */
  	for (i = 1; i < argc; i++)
  	{
  		for (j = 0; info_items[j].switchname != NULL; j++)
  		{
  			if (strcmp(argv[i], info_items[j].switchname) == 0)
  			{
! 				show_item(info_items[j].configname,
! 						  configdata, configdata_len);
  				break;
  			}
  		}
diff --git a/src/common/Makefile b/src/common/Makefile
index c47445e..ab183cf 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 23,30 ****
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! OBJS_COMMON = exec.o pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
! 	rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 23,43 ----
  override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
  LIBS += $(PTHREAD_LIBS)
  
! # don't include subdirectory-path-dependent -I and -L switches
! STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
! STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
! override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
! override CPPFLAGS += -DVAL_CC="\"$(CC)\""
! override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
! override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
! override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
! override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
! override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
! 
! OBJS_COMMON = exec.o config_info.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
*************** libpgcommon_srv.a: $(OBJS_SRV)
*** 61,67 ****
  # a hack that might fail someday if there is a *_srv.o without a
  # corresponding *.o, but it works for now.
  %_srv.o: %.c %.o
! 	$(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
  
  $(OBJS_SRV): | submake-errcodes
  
--- 74,80 ----
  # a hack that might fail someday if there is a *_srv.o without a
  # corresponding *.o, but it works for now.
  %_srv.o: %.c %.o
! 	$(CC) $(CFLAGS) $(subst -DFRONTEND ,, $(CPPFLAGS)) -c $< -o $@
  
  $(OBJS_SRV): | submake-errcodes
  
diff --git a/src/common/config_info.c b/src/common/config_info.c
index ...9053a8c .
*** a/src/common/config_info.c
--- b/src/common/config_info.c
***************
*** 0 ****
--- 1,206 ----
+ /*-------------------------------------------------------------------------
+  *
+  * config_info.c
+  *		Common code for pg_config output
+  *
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *
+  * IDENTIFICATION
+  *	  src/common/config_info.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ #ifndef FRONTEND
+ #include "postgres.h"
+ #else
+ #include "postgres_fe.h"
+ #endif
+ 
+ #include "miscadmin.h"
+ #include "common/config_info.h"
+ 
+ static size_t configdata_names_len(void);
+ 
+ static const char *const configdata_names[] =
+ {
+ 	"BINDIR",
+ 	"DOCDIR",
+ 	"HTMLDIR",
+ 	"INCLUDEDIR",
+ 	"PKGINCLUDEDIR",
+ 	"INCLUDEDIR-SERVER",
+ 	"LIBDIR",
+ 	"PKGLIBDIR",
+ 	"LOCALEDIR",
+ 	"MANDIR",
+ 	"SHAREDIR",
+ 	"SYSCONFDIR",
+ 	"PGXS",
+ 	"CONFIGURE",
+ 	"CC",
+ 	"CPPFLAGS",
+ 	"CFLAGS",
+ 	"CFLAGS_SL",
+ 	"LDFLAGS",
+ 	"LDFLAGS_EX",
+ 	"LDFLAGS_SL",
+ 	"LIBS",
+ 	"VERSION",
+ 	NULL
+ };
+ 
+ static size_t
+ configdata_names_len(void)
+ {
+ 	size_t	i = 0;
+ 
+ 	while (configdata_names[i])
+ 		i++;
+ 
+ 	return i;
+ }
+ 
+ /*
+  * get_configdata(char *my_exec_path, size_t *configdata_len)
+  *
+  * Get configure-time constants. The caller is responsible
+  * for pfreeing the result.
+  */
+ ConfigData *
+ get_configdata(char *my_exec_path, size_t *configdata_len)
+ {
+ 	ConfigData	   *configdata;
+ 	char			path[MAXPGPATH];
+ 	char		   *lastsep;
+ 	int				i;
+ 
+ 	*configdata_len = configdata_names_len();
+ 	configdata = palloc(*configdata_len * sizeof(ConfigData));
+ 
+ 	/*
+ 	 * initialize configdata names
+ 	 *
+ 	 * These better be in sync with the settings manually
+ 	 * defined below.
+ 	 */
+ 	for (i = 0; i < *configdata_len; i++)
+ 		configdata[i].name = pstrdup(configdata_names[i]);
+ 
+ 	strcpy(path, my_exec_path);
+ 	lastsep = strrchr(path, '/');
+ 	if (lastsep)
+ 		*lastsep = '\0';
+ 	cleanup_path(path);
+ 	configdata[0].setting = pstrdup(path);
+ 
+ 	get_doc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[1].setting = pstrdup(path);
+ 
+ 	get_html_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[2].setting = pstrdup(path);
+ 
+ 	get_include_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[3].setting = pstrdup(path);
+ 
+ 	get_pkginclude_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[4].setting = pstrdup(path);
+ 
+ 	get_includeserver_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[5].setting = pstrdup(path);
+ 
+ 	get_lib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[6].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[7].setting = pstrdup(path);
+ 
+ 	get_locale_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[8].setting = pstrdup(path);
+ 
+ 	get_man_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[9].setting = pstrdup(path);
+ 
+ 	get_share_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[10].setting = pstrdup(path);
+ 
+ 	get_etc_path(my_exec_path, path);
+ 	cleanup_path(path);
+ 	configdata[11].setting = pstrdup(path);
+ 
+ 	get_pkglib_path(my_exec_path, path);
+ 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ 	cleanup_path(path);
+ 	configdata[12].setting = pstrdup(path);
+ 
+ #ifdef VAL_CONFIGURE
+ 	configdata[13].setting = pstrdup(VAL_CONFIGURE);
+ #else
+ 	configdata[13].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CC
+ 	configdata[14].setting = pstrdup(VAL_CC);
+ #else
+ 	configdata[14].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CPPFLAGS
+ 	configdata[15].setting = pstrdup(VAL_CPPFLAGS);
+ #else
+ 	configdata[15].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS
+ 	configdata[16].setting = pstrdup(VAL_CFLAGS);
+ #else
+ 	configdata[16].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_CFLAGS_SL
+ 	configdata[17].setting = pstrdup(VAL_CFLAGS_SL);
+ #else
+ 	configdata[17].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS
+ 	configdata[18].setting = pstrdup(VAL_LDFLAGS);
+ #else
+ 	configdata[18].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_EX
+ 	configdata[19].setting = pstrdup(VAL_LDFLAGS_EX);
+ #else
+ 	configdata[19].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LDFLAGS_SL
+ 	configdata[20].setting = pstrdup(VAL_LDFLAGS_SL);
+ #else
+ 	configdata[20].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ #ifdef VAL_LIBS
+ 	configdata[21].setting = pstrdup(VAL_LIBS);
+ #else
+ 	configdata[21].setting = pstrdup(_("not recorded"));
+ #endif
+ 
+ 	configdata[22].setting = pstrdup("PostgreSQL " PG_VERSION);
+ 
+ 	return configdata;
+ }
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 378c40f..3b3bd17 100644
*** a/src/include/catalog/catversion.h
--- b/src/include/catalog/catversion.h
***************
*** 53,58 ****
   */
  
  /*							yyyymmddN */
! #define CATALOG_VERSION_NO	201602071
  
  #endif
--- 53,58 ----
   */
  
  /*							yyyymmddN */
! #define CATALOG_VERSION_NO	201602161
  
  #endif
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index b24e434..2222e8f 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("row security for current context
*** 5208,5213 ****
--- 5208,5217 ----
  DATA(insert OID = 3299 (  row_security_active	   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 1 0 16 "25" _null_ _null_ _null_ _null_ _null_	row_security_active_name _null_ _null_ _null_ ));
  DESCR("row security for current context active on table by table name");
  
+ /* pg_config */
+ DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
+ DESCR("pg_config binary as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/common/config_info.h b/src/include/common/config_info.h
index ...649ef5c .
*** a/src/include/common/config_info.h
--- b/src/include/common/config_info.h
***************
*** 0 ****
--- 1,21 ----
+ /*
+  * config_info.h
+  *		Common code for pg_config output
+  *
+  *	Copyright (c) 2016, PostgreSQL Global Development Group
+  *
+  *	src/include/common/config_info.h
+  */
+ #ifndef COMMON_CONFIG_INFO_H
+ #define COMMON_CONFIG_INFO_H
+ 
+ typedef struct ConfigData
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ } ConfigData;
+ 
+ extern ConfigData *get_configdata(char *my_exec_path,
+ 								  size_t *configdata_len);
+ 
+ #endif   /* COMMON_CONFIG_INFO_H */
diff --git a/src/include/port.h b/src/include/port.h
index 9fc79f4..cb13dd8 100644
*** a/src/include/port.h
--- b/src/include/port.h
*************** extern void join_path_components(char *r
*** 42,47 ****
--- 42,48 ----
  					 const char *head, const char *tail);
  extern void canonicalize_path(char *path);
  extern void make_native_path(char *path);
+ extern void cleanup_path(char *path);
  extern bool path_contains_parent_reference(const char *path);
  extern bool path_is_relative_and_below_cwd(const char *path);
  extern bool path_is_prefix_of_path(const char *path1, const char *path2);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index affcc01..a784de9 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum set_config_by_name(PG_FUNCT
*** 1147,1152 ****
--- 1147,1155 ----
  extern Datum show_all_settings(PG_FUNCTION_ARGS);
  extern Datum show_all_file_settings(PG_FUNCTION_ARGS);
  
+ /* pg_config.c */
+ extern Datum pg_config(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/port/path.c b/src/port/path.c
index a418f93..5c9de0c 100644
*** a/src/port/path.c
--- b/src/port/path.c
*************** make_native_path(char *filename)
*** 172,177 ****
--- 172,207 ----
  
  
  /*
+  * This function cleans up the paths for use with either cmd.exe or Msys
+  * on Windows. We need them to use filenames without spaces, for which a
+  * short filename is the safest equivalent, eg:
+  *		C:/Progra~1/
+  */
+ void
+ cleanup_path(char *path)
+ {
+ #ifdef WIN32
+ 	char	   *ptr;
+ 
+ 	/*
+ 	 * GetShortPathName() will fail if the path does not exist, or short names
+ 	 * are disabled on this file system.  In both cases, we just return the
+ 	 * original path.  This is particularly useful for --sysconfdir, which
+ 	 * might not exist.
+ 	 */
+ 	GetShortPathName(path, path, MAXPGPATH - 1);
+ 
+ 	/* Replace '\' with '/' */
+ 	for (ptr = path; *ptr; ptr++)
+ 	{
+ 		if (*ptr == '\\')
+ 			*ptr = '/';
+ 	}
+ #endif
+ }
+ 
+ 
+ /*
   * join_path_components - join two path components, inserting a slash
   *
   * We omit the slash if either given component is empty.
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 2bdba2d..81bc5c9 100644
*** a/src/test/regress/expected/rules.out
--- b/src/test/regress/expected/rules.out
*************** pg_available_extensions| SELECT e.name,
*** 1305,1310 ****
--- 1305,1313 ----
      e.comment
     FROM (pg_available_extensions() e(name, default_version, comment)
       LEFT JOIN pg_extension x ON ((e.name = x.extname)));
+ pg_config| SELECT pg_config.name,
+     pg_config.setting
+    FROM pg_config() pg_config(name, setting);
  pg_cursors| SELECT c.name,
      c.statement,
      c.is_holdable,
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 1dba7d9..e4fb44e 100644
*** a/src/tools/msvc/Mkvcbuild.pm
--- b/src/tools/msvc/Mkvcbuild.pm
*************** sub mkvcbuild
*** 106,113 ****
  	}
  
  	our @pgcommonallfiles = qw(
! 	  exec.c pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c
! 	  string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c
--- 106,113 ----
  	}
  
  	our @pgcommonallfiles = qw(
! 	  config_info.c exec.c pg_lzcompress.c pgfnames.c psprintf.c
! 	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f9eea76..c03b59f 100644
*** a/doc/src/sgml/func.sgml
--- b/doc/src/sgml/func.sgml
*************** SELECT collation for ('foo' COLLATE "de_
*** 16674,16679 ****
--- 16674,16789 ----
      </tgroup>
     </table>
  
+    <para>
+     The functions shown in <xref linkend="functions-controldata">
+     print information initialized during <command>initdb</>, such
+     as the catalog version. They also show information about write-ahead
+     logging and checkpoint processing. This information is cluster-wide,
+     and not specific to any one database. They provide most of the same
+     information, from the same source, as
+     <xref linkend="APP-PGCONTROLDATA">, although in a form better suited
+     to <acronym>SQL</acronym> functions.
+    </para>
+ 
+    <table id="functions-controldata">
+     <title>Control Data Functions</title>
+     <tgroup cols="3">
+      <thead>
+       <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry></row>
+      </thead>
+ 
+      <tbody>
+       <row>
+        <entry>
+         <indexterm><primary>pg_checkpoint_state</primary></indexterm>
+         <literal><function>pg_checkpoint_state()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about current checkpoint state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_controldata_state</primary></indexterm>
+         <literal><function>pg_controldata_state()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about current controldata file state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_init_state</primary></indexterm>
+         <literal><function>pg_init_state()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about cluster initialization state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_recovery_state</primary></indexterm>
+         <literal><function>pg_recovery_state()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about recovery state.
+        </entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <indexterm>
+     <primary>pg_checkpoint_state</primary>
+    </indexterm>
+    <para>
+     <function>pg_checkpoint_state</> returns a record containing
+     checkpoint_location, prior_location, redo_location, redo_wal_file,
+     timeline_id, prev_timeline_id, full_page_writes, next_xid, next_oid,
+     next_multixact_id, next_multi_offset, oldest_xid, oldest_xid_dbid,
+     oldest_active_xid, oldest_multi_xid, oldest_multi_dbid,
+     oldest_commit_ts_xid, newest_commit_ts_xid, and checkpoint_time.
+    </para>
+ 
+    <indexterm>
+     <primary>pg_controldata_state</primary>
+    </indexterm>
+    <para>
+     <function>pg_controldata_state</> returns a record containing
+     pg_control_version, catalog_version_no, system_identifier, and
+     pg_control_last_modified.
+    </para>
+ 
+    <indexterm>
+     <primary>pg_init_state</primary>
+    </indexterm>
+    <para>
+     <function>pg_init_state</> returns a record containing
+     max_data_alignment, database_block_size, blocks_per_segment,
+     wal_block_size, bytes_per_wal_segment, max_identifier_length,
+     max_index_columns, max_toast_chunk_size, large_object_chunk_size,
+     bigint_timestamps, float4_pass_by_value, float8_pass_by_value, and
+     data_page_checksum_version.
+    </para>
+ 
+    <indexterm>
+     <primary>pg_recovery_state</primary>
+    </indexterm>
+    <para>
+     <function>pg_recovery_state</> returns a record containing
+     min_recovery_end_location, min_recovery_end_timeline,
+     backup_start_location, backup_end_location, and
+     end_of_backup_record_required.
+    </para>
+ 
    </sect1>
  
    <sect1 id="functions-admin">
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index a0c82c1..a5b487d 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,20 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
         ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
--- 14,20 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_controldata.o pg_rusage.o \
         ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index ...489bf67 .
*** a/src/backend/utils/misc/pg_controldata.c
--- b/src/backend/utils/misc/pg_controldata.c
***************
*** 0 ****
--- 1,358 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_controldata.c
+  *		Expose select pg_controldata output, except via SQL functions
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_controldata.c
+  *-------------------------------------------------------------------------
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "access/htup_details.h"
+ #include "access/xlog_internal.h"
+ #include "catalog/pg_control.h"
+ #include "catalog/pg_type.h"
+ #include "common/controldata_utils.h"
+ #include "utils/builtins.h"
+ #include "utils/pg_lsn.h"
+ #include "utils/timestamp.h"
+ 
+ extern ControlData *controldata;
+ 
+ Datum
+ pg_controldata_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[4];
+ 	bool				nulls[4];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(4, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pg_control_version",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "catalog_version_no",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "system_identifier",
+ 					   INT8OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "pg_control_last_modified",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = Int32GetDatum(ControlFile->pg_control_version);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->catalog_version_no);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int64GetDatum(ControlFile->system_identifier);
+ 	nulls[2] = false;
+ 
+ 	values[3] = TimestampTzGetDatum(time_t_to_timestamptz(ControlFile->time));
+ 	nulls[3] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_checkpoint_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[19];
+ 	bool				nulls[19];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 	XLogSegNo			segno;
+ 	char				xlogfilename[MAXFNAMELEN];
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(19, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "checkpoint_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "prior_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "redo_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "redo_wal_file",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "prev_timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "full_page_writes",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "next_xid",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "next_oid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "next_multixact_id",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "next_multi_offset",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "oldest_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "oldest_xid_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 14, "oldest_active_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 15, "oldest_multi_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 16, "oldest_multi_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 17, "oldest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 18, "newest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 19, "checkpoint_time",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* Read the control file. */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	/* Make sure it is valid. */
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	/*
+ 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
+ 	 * start point.
+ 	 */
+ 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
+ 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+ 
+ 	/* Populate the values and null arrays */
+ 	values[0] = LSNGetDatum(ControlFile->checkPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = LSNGetDatum(ControlFile->prevCheckPoint);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->checkPointCopy.redo);
+ 	nulls[2] = false;
+ 
+ 	values[3] = CStringGetTextDatum(xlogfilename);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->checkPointCopy.ThisTimeLineID);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->checkPointCopy.PrevTimeLineID);
+ 	nulls[5] = false;
+ 
+ 	values[6] = BoolGetDatum(ControlFile->checkPointCopy.fullPageWrites);
+ 	nulls[6] = false;
+ 
+ 	values[7] = CStringGetTextDatum(psprintf("%u:%u",
+ 								ControlFile->checkPointCopy.nextXidEpoch,
+ 								ControlFile->checkPointCopy.nextXid));
+ 	nulls[7] = false;
+ 
+ 	values[8] = ObjectIdGetDatum(ControlFile->checkPointCopy.nextOid);
+ 	nulls[8] = false;
+ 
+ 	values[9] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMulti);
+ 	nulls[9] = false;
+ 
+ 	values[10] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMultiOffset);
+ 	nulls[10] = false;
+ 
+ 	values[11] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestXid);
+ 	nulls[11] = false;
+ 
+ 	values[12] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestXidDB);
+ 	nulls[12] = false;
+ 
+ 	values[13] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestActiveXid);
+ 	nulls[13] = false;
+ 
+ 	values[14] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestMulti);
+ 	nulls[14] = false;
+ 
+ 	values[15] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestMultiDB);
+ 	nulls[15] = false;
+ 
+ 	values[16] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestCommitTsXid);
+ 	nulls[16] = false;
+ 
+ 	values[17] = TransactionIdGetDatum(ControlFile->checkPointCopy.newestCommitTsXid);
+ 	nulls[17] = false;
+ 
+ 	values[18] = TimestampTzGetDatum(
+ 					time_t_to_timestamptz(ControlFile->checkPointCopy.time));
+ 	nulls[18] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_recovery_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[5];
+ 	bool				nulls[5];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(5, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "min_recovery_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "min_recovery_end_timeline",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "backup_start_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "backup_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "end_of_backup_record_required",
+ 					   BOOLOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = LSNGetDatum(ControlFile->minRecoveryPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->minRecoveryPointTLI);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->backupStartPoint);
+ 	nulls[2] = false;
+ 
+ 	values[3] = LSNGetDatum(ControlFile->backupEndPoint);
+ 	nulls[3] = false;
+ 
+ 	values[4] = BoolGetDatum(ControlFile->backupEndRequired);
+ 	nulls[4] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_init_state(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[13];
+ 	bool				nulls[13];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(13, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "max_data_alignment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "database_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "blocks_per_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "wal_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "bytes_per_wal_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "max_identifier_length",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "max_index_columns",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "max_toast_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "large_object_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "bigint_timestamps",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "float4_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "float8_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "data_page_checksum_version",
+ 					   INT4OID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = Int32GetDatum(ControlFile->maxAlign);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->blcksz);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int32GetDatum(ControlFile->relseg_size);
+ 	nulls[2] = false;
+ 
+ 	values[3] = Int32GetDatum(ControlFile->xlog_blcksz);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->xlog_seg_size);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->nameDataLen);
+ 	nulls[5] = false;
+ 
+ 	values[6] = Int32GetDatum(ControlFile->indexMaxKeys);
+ 	nulls[6] = false;
+ 
+ 	values[7] = Int32GetDatum(ControlFile->toast_max_chunk_size);
+ 	nulls[7] = false;
+ 
+ 	values[8] = Int32GetDatum(ControlFile->loblksize);
+ 	nulls[8] = false;
+ 
+ 	values[9] = BoolGetDatum(ControlFile->enableIntTimes);
+ 	nulls[9] = false;
+ 
+ 	values[10] = BoolGetDatum(ControlFile->float4ByVal);
+ 	nulls[10] = false;
+ 
+ 	values[11] = BoolGetDatum(ControlFile->float8ByVal);
+ 	nulls[11] = false;
+ 
+ 	values[12] = Int32GetDatum(ControlFile->data_checksum_version);
+ 	nulls[12] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 5dd2dbc..944a879 100644
*** a/src/bin/pg_controldata/pg_controldata.c
--- b/src/bin/pg_controldata/pg_controldata.c
***************
*** 9,31 ****
   * src/bin/pg_controldata/pg_controldata.c
   */
  
! /*
!  * We have to use postgres.h not postgres_fe.h here, because there's so much
!  * backend-only stuff in the XLOG include files we need.  But we need a
!  * frontend-ish environment otherwise.  Hence this ugly hack.
!  */
! #define FRONTEND 1
! 
! #include "postgres.h"
! 
! #include <unistd.h>
! #include <time.h>
! #include <sys/stat.h>
! #include <fcntl.h>
  
- #include "access/xlog.h"
- #include "access/xlog_internal.h"
  #include "catalog/pg_control.h"
  #include "pg_getopt.h"
  
  
--- 9,18 ----
   * src/bin/pg_controldata/pg_controldata.c
   */
  
! #include "postgres_fe.h"
  
  #include "catalog/pg_control.h"
+ #include "common/controldata_utils.h"
  #include "pg_getopt.h"
  
  
*************** usage(const char *progname)
*** 45,108 ****
  }
  
  
! static const char *
! dbState(DBState state)
! {
! 	switch (state)
! 	{
! 		case DB_STARTUP:
! 			return _("starting up");
! 		case DB_SHUTDOWNED:
! 			return _("shut down");
! 		case DB_SHUTDOWNED_IN_RECOVERY:
! 			return _("shut down in recovery");
! 		case DB_SHUTDOWNING:
! 			return _("shutting down");
! 		case DB_IN_CRASH_RECOVERY:
! 			return _("in crash recovery");
! 		case DB_IN_ARCHIVE_RECOVERY:
! 			return _("in archive recovery");
! 		case DB_IN_PRODUCTION:
! 			return _("in production");
! 	}
! 	return _("unrecognized status code");
! }
! 
! static const char *
! wal_level_str(WalLevel wal_level)
! {
! 	switch (wal_level)
! 	{
! 		case WAL_LEVEL_MINIMAL:
! 			return "minimal";
! 		case WAL_LEVEL_ARCHIVE:
! 			return "archive";
! 		case WAL_LEVEL_HOT_STANDBY:
! 			return "hot_standby";
! 		case WAL_LEVEL_LOGICAL:
! 			return "logical";
! 	}
! 	return _("unrecognized wal_level");
! }
! 
! 
  int
  main(int argc, char *argv[])
  {
! 	ControlFileData ControlFile;
! 	int			fd;
! 	char		ControlFilePath[MAXPGPATH];
! 	char	   *DataDir = NULL;
! 	pg_crc32c	crc;
! 	time_t		time_tmp;
! 	char		pgctime_str[128];
! 	char		ckpttime_str[128];
! 	char		sysident_str[32];
! 	const char *strftime_fmt = "%c";
! 	const char *progname;
! 	XLogSegNo	segno;
! 	char		xlogfilename[MAXFNAMELEN];
! 	int			c;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_controldata"));
  
--- 32,48 ----
  }
  
  
! #define CONTROLDATANAME_LEN 39
! #define CONTROLDATANAME_FMT "%-39s%s\n"
  int
  main(int argc, char *argv[])
  {
! 	char		   *DataDir = NULL;
! 	ControlData	   *controldata;
! 	size_t			controldata_len;
! 	char			controldata_name[CONTROLDATANAME_LEN + 1];
! 	const char	   *progname;
! 	int				c, i;
  
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_controldata"));
  
*************** main(int argc, char *argv[])
*** 161,338 ****
  		exit(1);
  	}
  
! 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
! 
! 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
! 	{
! 		fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
! 	}
! 
! 	if (read(fd, &ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
  	{
! 		fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
  	}
- 	close(fd);
- 
- 	/* Check the CRC. */
- 	INIT_CRC32C(crc);
- 	COMP_CRC32C(crc,
- 				(char *) &ControlFile,
- 				offsetof(ControlFileData, crc));
- 	FIN_CRC32C(crc);
- 
- 	if (!EQ_CRC32C(crc, ControlFile.crc))
- 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
- 				 "Either the file is corrupt, or it has a different layout than this program\n"
- 				 "is expecting.  The results below are untrustworthy.\n\n"));
- 
- 	/*
- 	 * This slightly-chintzy coding will work as long as the control file
- 	 * timestamps are within the range of time_t; that should be the case in
- 	 * all foreseeable circumstances, so we don't bother importing the
- 	 * backend's timezone library into pg_controldata.
- 	 *
- 	 * Use variable for format to suppress overly-anal-retentive gcc warning
- 	 * about %c
- 	 */
- 	time_tmp = (time_t) ControlFile.time;
- 	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
- 			 localtime(&time_tmp));
- 	time_tmp = (time_t) ControlFile.checkPointCopy.time;
- 	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
- 			 localtime(&time_tmp));
  
- 	/*
- 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
- 	 * start point.
- 	 */
- 	XLByteToSeg(ControlFile.checkPointCopy.redo, segno);
- 	XLogFileName(xlogfilename, ControlFile.checkPointCopy.ThisTimeLineID, segno);
- 
- 	/*
- 	 * Format system_identifier separately to keep platform-dependent format
- 	 * code out of the translatable message string.
- 	 */
- 	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
- 			 ControlFile.system_identifier);
- 
- 	printf(_("pg_control version number:            %u\n"),
- 		   ControlFile.pg_control_version);
- 	if (ControlFile.pg_control_version % 65536 == 0 && ControlFile.pg_control_version / 65536 != 0)
- 		printf(_("WARNING: possible byte ordering mismatch\n"
- 				 "The byte ordering used to store the pg_control file might not match the one\n"
- 				 "used by this program.  In that case the results below would be incorrect, and\n"
- 				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
- 	printf(_("Catalog version number:               %u\n"),
- 		   ControlFile.catalog_version_no);
- 	printf(_("Database system identifier:           %s\n"),
- 		   sysident_str);
- 	printf(_("Database cluster state:               %s\n"),
- 		   dbState(ControlFile.state));
- 	printf(_("pg_control last modified:             %s\n"),
- 		   pgctime_str);
- 	printf(_("Latest checkpoint location:           %X/%X\n"),
- 		   (uint32) (ControlFile.checkPoint >> 32),
- 		   (uint32) ControlFile.checkPoint);
- 	printf(_("Prior checkpoint location:            %X/%X\n"),
- 		   (uint32) (ControlFile.prevCheckPoint >> 32),
- 		   (uint32) ControlFile.prevCheckPoint);
- 	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
- 		   (uint32) (ControlFile.checkPointCopy.redo >> 32),
- 		   (uint32) ControlFile.checkPointCopy.redo);
- 	printf(_("Latest checkpoint's REDO WAL file:    %s\n"),
- 		   xlogfilename);
- 	printf(_("Latest checkpoint's TimeLineID:       %u\n"),
- 		   ControlFile.checkPointCopy.ThisTimeLineID);
- 	printf(_("Latest checkpoint's PrevTimeLineID:   %u\n"),
- 		   ControlFile.checkPointCopy.PrevTimeLineID);
- 	printf(_("Latest checkpoint's full_page_writes: %s\n"),
- 		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
- 	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
- 		   ControlFile.checkPointCopy.nextXidEpoch,
- 		   ControlFile.checkPointCopy.nextXid);
- 	printf(_("Latest checkpoint's NextOID:          %u\n"),
- 		   ControlFile.checkPointCopy.nextOid);
- 	printf(_("Latest checkpoint's NextMultiXactId:  %u\n"),
- 		   ControlFile.checkPointCopy.nextMulti);
- 	printf(_("Latest checkpoint's NextMultiOffset:  %u\n"),
- 		   ControlFile.checkPointCopy.nextMultiOffset);
- 	printf(_("Latest checkpoint's oldestXID:        %u\n"),
- 		   ControlFile.checkPointCopy.oldestXid);
- 	printf(_("Latest checkpoint's oldestXID's DB:   %u\n"),
- 		   ControlFile.checkPointCopy.oldestXidDB);
- 	printf(_("Latest checkpoint's oldestActiveXID:  %u\n"),
- 		   ControlFile.checkPointCopy.oldestActiveXid);
- 	printf(_("Latest checkpoint's oldestMultiXid:   %u\n"),
- 		   ControlFile.checkPointCopy.oldestMulti);
- 	printf(_("Latest checkpoint's oldestMulti's DB: %u\n"),
- 		   ControlFile.checkPointCopy.oldestMultiDB);
- 	printf(_("Latest checkpoint's oldestCommitTsXid:%u\n"),
- 		   ControlFile.checkPointCopy.oldestCommitTsXid);
- 	printf(_("Latest checkpoint's newestCommitTsXid:%u\n"),
- 		   ControlFile.checkPointCopy.newestCommitTsXid);
- 	printf(_("Time of latest checkpoint:            %s\n"),
- 		   ckpttime_str);
- 	printf(_("Fake LSN counter for unlogged rels:   %X/%X\n"),
- 		   (uint32) (ControlFile.unloggedLSN >> 32),
- 		   (uint32) ControlFile.unloggedLSN);
- 	printf(_("Minimum recovery ending location:     %X/%X\n"),
- 		   (uint32) (ControlFile.minRecoveryPoint >> 32),
- 		   (uint32) ControlFile.minRecoveryPoint);
- 	printf(_("Min recovery ending loc's timeline:   %u\n"),
- 		   ControlFile.minRecoveryPointTLI);
- 	printf(_("Backup start location:                %X/%X\n"),
- 		   (uint32) (ControlFile.backupStartPoint >> 32),
- 		   (uint32) ControlFile.backupStartPoint);
- 	printf(_("Backup end location:                  %X/%X\n"),
- 		   (uint32) (ControlFile.backupEndPoint >> 32),
- 		   (uint32) ControlFile.backupEndPoint);
- 	printf(_("End-of-backup record required:        %s\n"),
- 		   ControlFile.backupEndRequired ? _("yes") : _("no"));
- 	printf(_("wal_level setting:                    %s\n"),
- 		   wal_level_str(ControlFile.wal_level));
- 	printf(_("wal_log_hints setting:                %s\n"),
- 		   ControlFile.wal_log_hints ? _("on") : _("off"));
- 	printf(_("max_connections setting:              %d\n"),
- 		   ControlFile.MaxConnections);
- 	printf(_("max_worker_processes setting:         %d\n"),
- 		   ControlFile.max_worker_processes);
- 	printf(_("max_prepared_xacts setting:           %d\n"),
- 		   ControlFile.max_prepared_xacts);
- 	printf(_("max_locks_per_xact setting:           %d\n"),
- 		   ControlFile.max_locks_per_xact);
- 	printf(_("track_commit_timestamp setting:       %s\n"),
- 		   ControlFile.track_commit_timestamp ? _("on") : _("off"));
- 	printf(_("Maximum data alignment:               %u\n"),
- 		   ControlFile.maxAlign);
- 	/* we don't print floatFormat since can't say much useful about it */
- 	printf(_("Database block size:                  %u\n"),
- 		   ControlFile.blcksz);
- 	printf(_("Blocks per segment of large relation: %u\n"),
- 		   ControlFile.relseg_size);
- 	printf(_("WAL block size:                       %u\n"),
- 		   ControlFile.xlog_blcksz);
- 	printf(_("Bytes per WAL segment:                %u\n"),
- 		   ControlFile.xlog_seg_size);
- 	printf(_("Maximum length of identifiers:        %u\n"),
- 		   ControlFile.nameDataLen);
- 	printf(_("Maximum columns in an index:          %u\n"),
- 		   ControlFile.indexMaxKeys);
- 	printf(_("Maximum size of a TOAST chunk:        %u\n"),
- 		   ControlFile.toast_max_chunk_size);
- 	printf(_("Size of a large-object chunk:         %u\n"),
- 		   ControlFile.loblksize);
- 	printf(_("Date/time type storage:               %s\n"),
- 		   (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
- 	printf(_("Float4 argument passing:              %s\n"),
- 		   (ControlFile.float4ByVal ? _("by value") : _("by reference")));
- 	printf(_("Float8 argument passing:              %s\n"),
- 		   (ControlFile.float8ByVal ? _("by value") : _("by reference")));
- 	printf(_("Data page checksum version:           %u\n"),
- 		   ControlFile.data_checksum_version);
  	return 0;
  }
--- 101,114 ----
  		exit(1);
  	}
  
! 	controldata = get_controldata(DataDir, progname, &controldata_len);
! 	for (i = 0; i < controldata_len; i++)
  	{
! 		memset(controldata_name, ' ', CONTROLDATANAME_LEN);
! 		snprintf (controldata_name, CONTROLDATANAME_LEN,
! 				  "%s:", controldata[i].name);
! 		printf(CONTROLDATANAME_FMT, controldata_name, controldata[i].setting);
  	}
  
  	return 0;
  }
diff --git a/src/common/Makefile b/src/common/Makefile
index bde4fc2..f7a4a4d 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** override CPPFLAGS += -DVAL_LDFLAGS_EX="\
*** 36,43 ****
  override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
  override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
  
! OBJS_COMMON = config_info.o exec.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 36,43 ----
  override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
  override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
  
! OBJS_COMMON = config_info.o controldata_utils.o exec.o pg_lzcompress.o \
! 	pgfnames.o psprintf.o relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c
index ...686be76 .
*** a/src/common/controldata_utils.c
--- b/src/common/controldata_utils.c
***************
*** 0 ****
--- 1,382 ----
+ /*-------------------------------------------------------------------------
+  *
+  * controldata_utils.c
+  *		Common code for pg_controldata output
+  *
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *
+  * IDENTIFICATION
+  *	  src/common/controldata_utils.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ /*
+  * We have to use postgres.h not postgres_fe.h here, because there's so much
+  * backend-only stuff in the XLOG include files we need.
+  */
+ #include "postgres.h"
+ 
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+ #include "miscadmin.h"
+ #include "access/xlog.h"
+ #include "access/xlog_internal.h"
+ #include "catalog/pg_control.h"
+ #include "catalog/pg_type.h"
+ #include "common/controldata_utils.h"
+ #include "port/pg_crc32c.h"
+ #include "utils/builtins.h"
+ 
+ #ifndef FRONTEND
+ /* NOTE: caller must provide gettext call around str */
+ #define log_error(str, param1, param2)	\
+ 	elog(ERROR, str, param1, param2)
+ #else
+ #define log_error(str, param1, param2)	\
+ 	do { \
+ 			char *buf = psprintf("%%s: %s", str); \
+ 			fprintf(stderr, buf, progname, param1, param2); \
+ 			exit(2); \
+ 	} while (0)
+ #endif
+ 
+ static const char *dbState(DBState state);
+ static const char *wal_level_str(WalLevel wal_level);
+ 
+ static const char *const controldata_names[] =
+ {
+ 	gettext_noop("pg_control version number"),
+ 	gettext_noop("Catalog version number"),
+ 	gettext_noop("Database system identifier"),
+ 	gettext_noop("Database cluster state"),
+ 	gettext_noop("pg_control last modified"),
+ 	gettext_noop("Latest checkpoint location"),
+ 	gettext_noop("Prior checkpoint location"),
+ 	gettext_noop("Latest checkpoint's REDO location"),
+ 	gettext_noop("Latest checkpoint's REDO WAL file"),
+ 	gettext_noop("Latest checkpoint's TimeLineID"),
+ 	gettext_noop("Latest checkpoint's PrevTimeLineID"),
+ 	gettext_noop("Latest checkpoint's full_page_writes"),
+ 	gettext_noop("Latest checkpoint's NextXID"),
+ 	gettext_noop("Latest checkpoint's NextOID"),
+ 	gettext_noop("Latest checkpoint's NextMultiXactId"),
+ 	gettext_noop("Latest checkpoint's NextMultiOffset"),
+ 	gettext_noop("Latest checkpoint's oldestXID"),
+ 	gettext_noop("Latest checkpoint's oldestXID's DB"),
+ 	gettext_noop("Latest checkpoint's oldestActiveXID"),
+ 	gettext_noop("Latest checkpoint's oldestMultiXid"),
+ 	gettext_noop("Latest checkpoint's oldestMulti's DB"),
+ 	gettext_noop("Latest checkpoint's oldestCommitTsXid"),
+ 	gettext_noop("Latest checkpoint's newestCommitTsXid"),
+ 	gettext_noop("Time of latest checkpoint"),
+ 	gettext_noop("Fake LSN counter for unlogged rels"),
+ 	gettext_noop("Minimum recovery ending location"),
+ 	gettext_noop("Min recovery ending loc's timeline"),
+ 	gettext_noop("Backup start location"),
+ 	gettext_noop("Backup end location"),
+ 	gettext_noop("End-of-backup record required"),
+ 	gettext_noop("wal_level setting"),
+ 	gettext_noop("wal_log_hints setting"),
+ 	gettext_noop("max_connections setting"),
+ 	gettext_noop("max_worker_processes setting"),
+ 	gettext_noop("max_prepared_xacts setting"),
+ 	gettext_noop("max_locks_per_xact setting"),
+ 	gettext_noop("track_commit_timestamp setting"),
+ 	gettext_noop("Maximum data alignment"),
+ 	gettext_noop("Database block size"),
+ 	gettext_noop("Blocks per segment of large relation"),
+ 	gettext_noop("WAL block size"),
+ 	gettext_noop("Bytes per WAL segment"),
+ 	gettext_noop("Maximum length of identifiers"),
+ 	gettext_noop("Maximum columns in an index"),
+ 	gettext_noop("Maximum size of a TOAST chunk"),
+ 	gettext_noop("Size of a large-object chunk"),
+ 	gettext_noop("Date/time type storage"),
+ 	gettext_noop("Float4 argument passing"),
+ 	gettext_noop("Float8 argument passing"),
+ 	gettext_noop("Data page checksum version"),
+ 	NULL
+ };
+ 
+ static size_t
+ controldata_names_len(void)
+ {
+ 	size_t	i = 0;
+ 
+ 	while (controldata_names[i])
+ 		i++;
+ 
+ 	return i;
+ }
+ 
+ 
+ static const char *
+ dbState(DBState state)
+ {
+ 	switch (state)
+ 	{
+ 		case DB_STARTUP:
+ 			return _("starting up");
+ 		case DB_SHUTDOWNED:
+ 			return _("shut down");
+ 		case DB_SHUTDOWNED_IN_RECOVERY:
+ 			return _("shut down in recovery");
+ 		case DB_SHUTDOWNING:
+ 			return _("shutting down");
+ 		case DB_IN_CRASH_RECOVERY:
+ 			return _("in crash recovery");
+ 		case DB_IN_ARCHIVE_RECOVERY:
+ 			return _("in archive recovery");
+ 		case DB_IN_PRODUCTION:
+ 			return _("in production");
+ 	}
+ 	return _("unrecognized status code");
+ }
+ 
+ static const char *
+ wal_level_str(WalLevel wal_level)
+ {
+ 	switch (wal_level)
+ 	{
+ 		case WAL_LEVEL_MINIMAL:
+ 			return "minimal";
+ 		case WAL_LEVEL_ARCHIVE:
+ 			return "archive";
+ 		case WAL_LEVEL_HOT_STANDBY:
+ 			return "hot_standby";
+ 		case WAL_LEVEL_LOGICAL:
+ 			return "logical";
+ 	}
+ 	return _("unrecognized wal_level");
+ }
+ 
+ 
+ ControlFileData *
+ get_controlfile(char *DataDir, const char *progname)
+ {
+ 	ControlFileData	   *ControlFile;
+ 	int					fd;
+ 	char				ControlFilePath[MAXPGPATH];
+ 	pg_crc32c			crc;
+ 
+ 	ControlFile = palloc(sizeof(ControlFileData));
+ 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
+ 
+ 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
+ 		log_error(_("could not open file \"%s\" for reading: %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
+ 		log_error(_("could not read file \"%s\": %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	close(fd);
+ 
+ 	/* Check the CRC. */
+ 	INIT_CRC32C(crc);
+ 	COMP_CRC32C(crc,
+ 			   (char *) ControlFile,
+ 			   offsetof(ControlFileData, crc));
+ 	FIN_CRC32C(crc);
+ 
+ 	if (!EQ_CRC32C(crc, ControlFile->crc))
+ #ifndef FRONTEND
+ 		elog(ERROR, _("calculated CRC checksum does not match value stored in file"));
+ #else
+ 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
+ 				 "Either the file is corrupt, or it has a different layout than this program\n"
+ 				 "is expecting.  The results below are untrustworthy.\n\n"));
+ #endif
+ 
+ 	return ControlFile;
+ }
+ 
+ ControlData *
+ get_controldata(char *DataDir, const char *progname,
+ 				size_t *controldata_len)
+ {
+ 	ControlFileData	   *ControlFile;
+ 	ControlData		   *controldata;
+ 	time_t				time_tmp;
+ 	char				pgctime_str[128];
+ 	char				ckpttime_str[128];
+ 	char				sysident_str[32];
+ 	const char		   *strftime_fmt = "%c";
+ 	XLogSegNo			segno;
+ 	char				xlogfilename[MAXFNAMELEN];
+ 	int					i;
+ 	int					idx = 0;
+ 
+ 	*controldata_len = controldata_names_len();
+ 	controldata = palloc(*controldata_len * sizeof(ControlData));
+ 
+ 	/*
+ 	 * initialize controldata names
+ 	 *
+ 	 * These better be in sync with the settings manually
+ 	 * defined below.
+ 	 */
+ 	for (i = 0; i < *controldata_len; i++)
+ 		controldata[i].name = pstrdup(_(controldata_names[i]));
+ 
+ 	/* get a copy of the control file */
+ 	ControlFile = get_controlfile(DataDir, progname);
+ 
+ 	/*
+ 	 * This slightly-chintzy coding will work as long as the control file
+ 	 * timestamps are within the range of time_t; that should be the case in
+ 	 * all foreseeable circumstances, so we don't bother importing the
+ 	 * backend's timezone library.
+ 	 *
+ 	 * Use variable for format to suppress overly-anal-retentive gcc warning
+ 	 * about %c
+ 	 */
+ 	time_tmp = (time_t) ControlFile->time;
+ 	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
+ 			 localtime(&time_tmp));
+ 	time_tmp = (time_t) ControlFile->checkPointCopy.time;
+ 	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
+ 			 localtime(&time_tmp));
+ 
+ 	/*
+ 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
+ 	 * start point.
+ 	 */
+ 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
+ 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+ 
+ 	/*
+ 	 * Format system_identifier separately to keep platform-dependent format
+ 	 * code out of the translatable message string.
+ 	 */
+ 	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
+ 			 ControlFile->system_identifier);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ #ifndef FRONTEND
+ 		elog(ERROR, _("byte ordering mismatch"));
+ #else
+ 		printf(_("WARNING: possible byte ordering mismatch\n"
+ 				 "The byte ordering used to store the pg_control file might not match the one\n"
+ 				 "used by this program.  In that case the results below would be incorrect, and\n"
+ 				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
+ #endif
+ 
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->pg_control_version);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->catalog_version_no);
+ 	controldata[idx++].setting = psprintf("%s",
+ 		sysident_str);
+ 	controldata[idx++].setting = psprintf("%s",
+ 		dbState(ControlFile->state));
+ 	controldata[idx++].setting = psprintf("%s",
+ 		pgctime_str);
+ 	controldata[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->checkPoint >> 32),
+ 		(uint32) ControlFile->checkPoint);
+ 	controldata[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->prevCheckPoint >> 32),
+ 		(uint32) ControlFile->prevCheckPoint);
+ 	controldata[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->checkPointCopy.redo >> 32),
+ 		(uint32) ControlFile->checkPointCopy.redo);
+ 	controldata[idx++].setting = psprintf("%s", xlogfilename);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.ThisTimeLineID);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.PrevTimeLineID);
+ 	controldata[idx++].setting = psprintf("%s",
+ 		ControlFile->checkPointCopy.fullPageWrites ? _("on") : _("off"));
+ 	controldata[idx++].setting = psprintf("%u:%u",
+ 		ControlFile->checkPointCopy.nextXidEpoch,
+ 		ControlFile->checkPointCopy.nextXid);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.nextOid);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.nextMulti);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.nextMultiOffset);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestXid);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestXidDB);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestActiveXid);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestMulti);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestMultiDB);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.oldestCommitTsXid);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->checkPointCopy.newestCommitTsXid);
+ 	controldata[idx++].setting = psprintf("%s", ckpttime_str);
+ 	controldata[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->unloggedLSN >> 32),
+ 		(uint32) ControlFile->unloggedLSN);
+ 	controldata[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->minRecoveryPoint >> 32),
+ 		(uint32) ControlFile->minRecoveryPoint);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->minRecoveryPointTLI);
+ 	controldata[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->backupStartPoint >> 32),
+ 		(uint32) ControlFile->backupStartPoint);
+ 	controldata[idx++].setting = psprintf("%X/%X",
+ 		(uint32) (ControlFile->backupEndPoint >> 32),
+ 		(uint32) ControlFile->backupEndPoint);
+ 	controldata[idx++].setting = psprintf("%s",
+ 		ControlFile->backupEndRequired ? _("yes") : _("no"));
+ 	controldata[idx++].setting = psprintf("%s",
+ 		wal_level_str(ControlFile->wal_level));
+ 	controldata[idx++].setting = psprintf("%s",
+ 		ControlFile->wal_log_hints ? _("on") : _("off"));
+ 	controldata[idx++].setting = psprintf("%d",
+ 		ControlFile->MaxConnections);
+ 	controldata[idx++].setting = psprintf("%d",
+ 		ControlFile->max_worker_processes);
+ 	controldata[idx++].setting = psprintf("%d",
+ 		ControlFile->max_prepared_xacts);
+ 	controldata[idx++].setting = psprintf("%d",
+ 		ControlFile->max_locks_per_xact);
+ 	controldata[idx++].setting = psprintf("%s",
+ 		ControlFile->track_commit_timestamp ? _("on") : _("off"));
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->maxAlign);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->blcksz);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->relseg_size);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->xlog_blcksz);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->xlog_seg_size);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->nameDataLen);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->indexMaxKeys);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->toast_max_chunk_size);
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->loblksize);
+ 	controldata[idx++].setting = psprintf("%s",
+ 		(ControlFile->enableIntTimes ?
+ 		 _("64-bit integers") : _("floating-point numbers")));
+ 	controldata[idx++].setting = psprintf("%s",
+ 		(ControlFile->float4ByVal ? _("by value") : _("by reference")));
+ 	controldata[idx++].setting = psprintf("%s",
+ 		(ControlFile->float8ByVal ? _("by value") : _("by reference")));
+ 	controldata[idx++].setting = psprintf("%u",
+ 		ControlFile->data_checksum_version);
+ 
+ 	return controldata;
+ }
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 2222e8f..2e269aa 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("row security for current context
*** 5212,5217 ****
--- 5212,5230 ----
  DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
  DESCR("pg_config binary as a function");
  
+ /* pg_controldata related functions */
+ DATA(insert OID = 3441 ( pg_controldata_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,20,1184}" "{o,o,o,o}" "{pg_control_version,catalog_version_no,system_identifier,pg_control_last_modified}" _null_ _null_ pg_controldata_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata general state information as a function");
+ 
+ DATA(insert OID = 3442 ( pg_checkpoint_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,3220,3220,25,23,23,16,25,26,28,28,28,26,28,28,26,28,28,1184}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{checkpoint_location,prior_location,redo_location,redo_wal_file,timeline_id,prev_timeline_id,full_page_writes,next_xid,next_oid,next_multixact_id,next_multi_offset,oldest_xid,oldest_xid_dbid,oldest_active_xid,oldest_multi_xid,oldest_multi_dbid,oldest_commit_ts_xid,newest_commit_ts_xid,checkpoint_time}" _null_ _null_ pg_checkpoint_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata checkpoint state information as a function");
+ 
+ DATA(insert OID = 3443 ( pg_recovery_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,23,3220,3220,16}" "{o,o,o,o,o}" "{min_recovery_end_location,min_recovery_end_timeline,backup_start_location,backup_end_location,end_of_backup_record_required}" _null_ _null_ pg_recovery_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata recovery state information as a function");
+ 
+ DATA(insert OID = 3444 ( pg_init_state PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,23,23,23,23,23,23,23,16,16,16,23}" "{o,o,o,o,o,o,o,o,o,o,o,o,o}" "{max_data_alignment,database_block_size,blocks_per_segment,wal_block_size,bytes_per_wal_segment,max_identifier_length,max_index_columns,max_toast_chunk_size,large_object_chunk_size,bigint_timestamps,float4_pass_by_value,float8_pass_by_value,data_page_checksum_version}" _null_ _null_ pg_init_state _null_ _null_ _null_ ));
+ DESCR("pg_controldata init state information as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/common/controldata_utils.h b/src/include/common/controldata_utils.h
index ...5dcc45f .
*** a/src/include/common/controldata_utils.h
--- b/src/include/common/controldata_utils.h
***************
*** 0 ****
--- 1,23 ----
+ /*
+  * controldata_utils.h
+  *		Common code for pg_controldata output
+  *
+  *	Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  *	Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *	src/include/common/controldata_utils.h
+  */
+ #ifndef COMMON_CONTROLDATA_UTILS_H
+ #define COMMON_CONTROLDATA_UTILS_H
+ 
+ typedef struct ControlData
+ {
+ 	char	   *name;
+ 	char	   *setting;
+ } ControlData;
+ 
+ extern ControlFileData *get_controlfile(char *DataDir, const char *progname);
+ extern ControlData *get_controldata(char *DataDir, const char *progname,
+ 									size_t *controldata_len);
+ 
+ #endif   /* COMMON_CONTROLDATA_UTILS_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index a784de9..6fbd89c 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum show_all_file_settings(PG_F
*** 1150,1155 ****
--- 1150,1161 ----
  /* pg_config.c */
  extern Datum pg_config(PG_FUNCTION_ARGS);
  
+ /* pg_controldata.c */
+ extern Datum pg_checkpoint_state(PG_FUNCTION_ARGS);
+ extern Datum pg_controldata_state(PG_FUNCTION_ARGS);
+ extern Datum pg_init_state(PG_FUNCTION_ARGS);
+ extern Datum pg_recovery_state(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index e4fb44e..1a9c996 100644
*** a/src/tools/msvc/Mkvcbuild.pm
--- b/src/tools/msvc/Mkvcbuild.pm
*************** sub mkvcbuild
*** 106,112 ****
  	}
  
  	our @pgcommonallfiles = qw(
! 	  config_info.c exec.c pg_lzcompress.c pgfnames.c psprintf.c
  	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
--- 106,112 ----
  	}
  
  	our @pgcommonallfiles = qw(
! 	  config_info.c controldata_utils.c exec.c pg_lzcompress.c pgfnames.c
  	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index c0b94bc..4b5ee81 100644
*** a/doc/src/sgml/func.sgml
--- b/doc/src/sgml/func.sgml
*************** SELECT collation for ('foo' COLLATE "de_
*** 16703,16708 ****
--- 16703,17064 ----
      </tgroup>
     </table>
  
+    <para>
+     The functions shown in <xref linkend="functions-controldata">
+     print information initialized during <command>initdb</>, such
+     as the catalog version. They also show information about write-ahead
+     logging and checkpoint processing. This information is cluster-wide,
+     and not specific to any one database. They provide most of the same
+     information, from the same source, as
+     <xref linkend="APP-PGCONTROLDATA">, although in a form better suited
+     to <acronym>SQL</acronym> functions.
+    </para>
+ 
+    <table id="functions-controldata">
+     <title>Control Data Functions</title>
+     <tgroup cols="3">
+      <thead>
+       <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry></row>
+      </thead>
+ 
+      <tbody>
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_checkpoint</primary></indexterm>
+         <literal><function>pg_control_checkpoint()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about current checkpoint state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_system</primary></indexterm>
+         <literal><function>pg_control_system()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about current controldata file state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_init</primary></indexterm>
+         <literal><function>pg_control_init()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about cluster initialization state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_recovery</primary></indexterm>
+         <literal><function>pg_control_recovery()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about recovery state.
+        </entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_checkpoint</> returns a record, shown in
+     <xref linkend="functions-pg-control-checkpoint">
+    </para>
+ 
+    <table id="functions-pg-control-checkpoint">
+     <title><function>pg_control_checkpoint</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>checkpoint_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>prior_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>redo_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>redo_wal_file</entry>
+        <entry><type>text</type></entry>
+       </row>
+ 
+       <row>
+        <entry>timeline_id</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>prev_timeline_id</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>full_page_writes</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_xid</entry>
+        <entry><type>text</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_oid</entry>
+        <entry><type>oid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_multixact_id</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_multi_offset</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_xid_dbid</entry>
+        <entry><type>oid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_active_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_multi_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_multi_dbid</entry>
+        <entry><type>oid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_commit_ts_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>newest_commit_ts_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>checkpoint_time</entry>
+        <entry><type>timestamp with time zone</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_system</> returns a record, shown in
+     <xref linkend="functions-pg-control-system">
+    </para>
+ 
+    <table id="functions-pg-control-system">
+     <title><function>pg_control_system</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>pg_control_version</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>catalog_version_no</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>system_identifier</entry>
+        <entry><type>bigint</type></entry>
+       </row>
+ 
+       <row>
+        <entry>pg_control_last_modified</entry>
+        <entry><type>timestamp with time zone</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_init</> returns a record, shown in
+     <xref linkend="functions-pg-control-init">
+    </para>
+ 
+    <table id="functions-pg-control-init">
+     <title><function>pg_control_init</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>max_data_alignment</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>database_block_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>blocks_per_segment</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>wal_block_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>bytes_per_wal_segment</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>max_identifier_length</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>max_index_columns</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>max_toast_chunk_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>large_object_chunk_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>bigint_timestamps</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>float4_pass_by_value</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>float8_pass_by_value</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>data_page_checksum_version</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_recovery</> returns a record, shown in
+     <xref linkend="functions-pg-control-recovery">
+    </para>
+ 
+    <table id="functions-pg-control-recovery">
+     <title><function>pg_control_recovery</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>min_recovery_end_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>min_recovery_end_timeline</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>backup_start_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>backup_end_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>end_of_backup_record_required</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
    </sect1>
  
    <sect1 id="functions-admin">
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index a0c82c1..a5b487d 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,20 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
         ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
--- 14,20 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_controldata.o pg_rusage.o \
         ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index ...6aa4fdf .
*** a/src/backend/utils/misc/pg_controldata.c
--- b/src/backend/utils/misc/pg_controldata.c
***************
*** 0 ****
--- 1,356 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_controldata.c
+  *		Expose select pg_controldata output, except via SQL functions
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_controldata.c
+  *-------------------------------------------------------------------------
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "access/htup_details.h"
+ #include "access/xlog_internal.h"
+ #include "catalog/pg_control.h"
+ #include "catalog/pg_type.h"
+ #include "common/controldata_utils.h"
+ #include "utils/builtins.h"
+ #include "utils/pg_lsn.h"
+ #include "utils/timestamp.h"
+ 
+ Datum
+ pg_control_system(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[4];
+ 	bool				nulls[4];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(4, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pg_control_version",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "catalog_version_no",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "system_identifier",
+ 					   INT8OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "pg_control_last_modified",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = Int32GetDatum(ControlFile->pg_control_version);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->catalog_version_no);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int64GetDatum(ControlFile->system_identifier);
+ 	nulls[2] = false;
+ 
+ 	values[3] = TimestampTzGetDatum(time_t_to_timestamptz(ControlFile->time));
+ 	nulls[3] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_control_checkpoint(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[19];
+ 	bool				nulls[19];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 	XLogSegNo			segno;
+ 	char				xlogfilename[MAXFNAMELEN];
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(19, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "checkpoint_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "prior_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "redo_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "redo_wal_file",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "prev_timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "full_page_writes",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "next_xid",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "next_oid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "next_multixact_id",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "next_multi_offset",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "oldest_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "oldest_xid_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 14, "oldest_active_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 15, "oldest_multi_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 16, "oldest_multi_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 17, "oldest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 18, "newest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 19, "checkpoint_time",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* Read the control file. */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	/* Make sure it is valid. */
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	/*
+ 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
+ 	 * start point.
+ 	 */
+ 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
+ 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+ 
+ 	/* Populate the values and null arrays */
+ 	values[0] = LSNGetDatum(ControlFile->checkPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = LSNGetDatum(ControlFile->prevCheckPoint);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->checkPointCopy.redo);
+ 	nulls[2] = false;
+ 
+ 	values[3] = CStringGetTextDatum(xlogfilename);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->checkPointCopy.ThisTimeLineID);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->checkPointCopy.PrevTimeLineID);
+ 	nulls[5] = false;
+ 
+ 	values[6] = BoolGetDatum(ControlFile->checkPointCopy.fullPageWrites);
+ 	nulls[6] = false;
+ 
+ 	values[7] = CStringGetTextDatum(psprintf("%u:%u",
+ 								ControlFile->checkPointCopy.nextXidEpoch,
+ 								ControlFile->checkPointCopy.nextXid));
+ 	nulls[7] = false;
+ 
+ 	values[8] = ObjectIdGetDatum(ControlFile->checkPointCopy.nextOid);
+ 	nulls[8] = false;
+ 
+ 	values[9] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMulti);
+ 	nulls[9] = false;
+ 
+ 	values[10] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMultiOffset);
+ 	nulls[10] = false;
+ 
+ 	values[11] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestXid);
+ 	nulls[11] = false;
+ 
+ 	values[12] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestXidDB);
+ 	nulls[12] = false;
+ 
+ 	values[13] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestActiveXid);
+ 	nulls[13] = false;
+ 
+ 	values[14] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestMulti);
+ 	nulls[14] = false;
+ 
+ 	values[15] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestMultiDB);
+ 	nulls[15] = false;
+ 
+ 	values[16] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestCommitTsXid);
+ 	nulls[16] = false;
+ 
+ 	values[17] = TransactionIdGetDatum(ControlFile->checkPointCopy.newestCommitTsXid);
+ 	nulls[17] = false;
+ 
+ 	values[18] = TimestampTzGetDatum(
+ 					time_t_to_timestamptz(ControlFile->checkPointCopy.time));
+ 	nulls[18] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_control_recovery(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[5];
+ 	bool				nulls[5];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(5, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "min_recovery_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "min_recovery_end_timeline",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "backup_start_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "backup_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "end_of_backup_record_required",
+ 					   BOOLOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = LSNGetDatum(ControlFile->minRecoveryPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->minRecoveryPointTLI);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->backupStartPoint);
+ 	nulls[2] = false;
+ 
+ 	values[3] = LSNGetDatum(ControlFile->backupEndPoint);
+ 	nulls[3] = false;
+ 
+ 	values[4] = BoolGetDatum(ControlFile->backupEndRequired);
+ 	nulls[4] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_control_init(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[13];
+ 	bool				nulls[13];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(13, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "max_data_alignment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "database_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "blocks_per_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "wal_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "bytes_per_wal_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "max_identifier_length",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "max_index_columns",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "max_toast_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "large_object_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "bigint_timestamps",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "float4_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "float8_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "data_page_checksum_version",
+ 					   INT4OID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ 		elog(ERROR, _("byte ordering mismatch"));
+ 
+ 	values[0] = Int32GetDatum(ControlFile->maxAlign);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->blcksz);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int32GetDatum(ControlFile->relseg_size);
+ 	nulls[2] = false;
+ 
+ 	values[3] = Int32GetDatum(ControlFile->xlog_blcksz);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->xlog_seg_size);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->nameDataLen);
+ 	nulls[5] = false;
+ 
+ 	values[6] = Int32GetDatum(ControlFile->indexMaxKeys);
+ 	nulls[6] = false;
+ 
+ 	values[7] = Int32GetDatum(ControlFile->toast_max_chunk_size);
+ 	nulls[7] = false;
+ 
+ 	values[8] = Int32GetDatum(ControlFile->loblksize);
+ 	nulls[8] = false;
+ 
+ 	values[9] = BoolGetDatum(ControlFile->enableIntTimes);
+ 	nulls[9] = false;
+ 
+ 	values[10] = BoolGetDatum(ControlFile->float4ByVal);
+ 	nulls[10] = false;
+ 
+ 	values[11] = BoolGetDatum(ControlFile->float8ByVal);
+ 	nulls[11] = false;
+ 
+ 	values[12] = Int32GetDatum(ControlFile->data_checksum_version);
+ 	nulls[12] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 5dd2dbc..756b641 100644
*** a/src/bin/pg_controldata/pg_controldata.c
--- b/src/bin/pg_controldata/pg_controldata.c
***************
*** 18,31 ****
  
  #include "postgres.h"
  
- #include <unistd.h>
  #include <time.h>
- #include <sys/stat.h>
- #include <fcntl.h>
  
  #include "access/xlog.h"
  #include "access/xlog_internal.h"
  #include "catalog/pg_control.h"
  #include "pg_getopt.h"
  
  
--- 18,29 ----
  
  #include "postgres.h"
  
  #include <time.h>
  
  #include "access/xlog.h"
  #include "access/xlog_internal.h"
  #include "catalog/pg_control.h"
+ #include "common/controldata_utils.h"
  #include "pg_getopt.h"
  
  
*************** wal_level_str(WalLevel wal_level)
*** 89,99 ****
  int
  main(int argc, char *argv[])
  {
! 	ControlFileData ControlFile;
! 	int			fd;
! 	char		ControlFilePath[MAXPGPATH];
  	char	   *DataDir = NULL;
- 	pg_crc32c	crc;
  	time_t		time_tmp;
  	char		pgctime_str[128];
  	char		ckpttime_str[128];
--- 87,94 ----
  int
  main(int argc, char *argv[])
  {
! 	ControlFileData *ControlFile;
  	char	   *DataDir = NULL;
  	time_t		time_tmp;
  	char		pgctime_str[128];
  	char		ckpttime_str[128];
*************** main(int argc, char *argv[])
*** 161,194 ****
  		exit(1);
  	}
  
! 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
! 
! 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
! 	{
! 		fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
! 	}
! 
! 	if (read(fd, &ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
! 	{
! 		fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
! 	}
! 	close(fd);
! 
! 	/* Check the CRC. */
! 	INIT_CRC32C(crc);
! 	COMP_CRC32C(crc,
! 				(char *) &ControlFile,
! 				offsetof(ControlFileData, crc));
! 	FIN_CRC32C(crc);
! 
! 	if (!EQ_CRC32C(crc, ControlFile.crc))
! 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
! 				 "Either the file is corrupt, or it has a different layout than this program\n"
! 				 "is expecting.  The results below are untrustworthy.\n\n"));
  
  	/*
  	 * This slightly-chintzy coding will work as long as the control file
--- 156,163 ----
  		exit(1);
  	}
  
!  	/* get a copy of the control file */
!  	ControlFile = get_controlfile(DataDir, progname);
  
  	/*
  	 * This slightly-chintzy coding will work as long as the control file
*************** main(int argc, char *argv[])
*** 199,208 ****
  	 * Use variable for format to suppress overly-anal-retentive gcc warning
  	 * about %c
  	 */
! 	time_tmp = (time_t) ControlFile.time;
  	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
  			 localtime(&time_tmp));
! 	time_tmp = (time_t) ControlFile.checkPointCopy.time;
  	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
  			 localtime(&time_tmp));
  
--- 168,177 ----
  	 * Use variable for format to suppress overly-anal-retentive gcc warning
  	 * about %c
  	 */
! 	time_tmp = (time_t) ControlFile->time;
  	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
  			 localtime(&time_tmp));
! 	time_tmp = (time_t) ControlFile->checkPointCopy.time;
  	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
  			 localtime(&time_tmp));
  
*************** main(int argc, char *argv[])
*** 210,338 ****
  	 * Calculate name of the WAL file containing the latest checkpoint's REDO
  	 * start point.
  	 */
! 	XLByteToSeg(ControlFile.checkPointCopy.redo, segno);
! 	XLogFileName(xlogfilename, ControlFile.checkPointCopy.ThisTimeLineID, segno);
  
  	/*
  	 * Format system_identifier separately to keep platform-dependent format
  	 * code out of the translatable message string.
  	 */
  	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
! 			 ControlFile.system_identifier);
  
  	printf(_("pg_control version number:            %u\n"),
! 		   ControlFile.pg_control_version);
! 	if (ControlFile.pg_control_version % 65536 == 0 && ControlFile.pg_control_version / 65536 != 0)
  		printf(_("WARNING: possible byte ordering mismatch\n"
  				 "The byte ordering used to store the pg_control file might not match the one\n"
  				 "used by this program.  In that case the results below would be incorrect, and\n"
  				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
  	printf(_("Catalog version number:               %u\n"),
! 		   ControlFile.catalog_version_no);
  	printf(_("Database system identifier:           %s\n"),
  		   sysident_str);
  	printf(_("Database cluster state:               %s\n"),
! 		   dbState(ControlFile.state));
  	printf(_("pg_control last modified:             %s\n"),
  		   pgctime_str);
  	printf(_("Latest checkpoint location:           %X/%X\n"),
! 		   (uint32) (ControlFile.checkPoint >> 32),
! 		   (uint32) ControlFile.checkPoint);
  	printf(_("Prior checkpoint location:            %X/%X\n"),
! 		   (uint32) (ControlFile.prevCheckPoint >> 32),
! 		   (uint32) ControlFile.prevCheckPoint);
  	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
! 		   (uint32) (ControlFile.checkPointCopy.redo >> 32),
! 		   (uint32) ControlFile.checkPointCopy.redo);
  	printf(_("Latest checkpoint's REDO WAL file:    %s\n"),
  		   xlogfilename);
  	printf(_("Latest checkpoint's TimeLineID:       %u\n"),
! 		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's PrevTimeLineID:   %u\n"),
! 		   ControlFile.checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
! 		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
  	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
! 		   ControlFile.checkPointCopy.nextXidEpoch,
! 		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
! 		   ControlFile.checkPointCopy.nextOid);
  	printf(_("Latest checkpoint's NextMultiXactId:  %u\n"),
! 		   ControlFile.checkPointCopy.nextMulti);
  	printf(_("Latest checkpoint's NextMultiOffset:  %u\n"),
! 		   ControlFile.checkPointCopy.nextMultiOffset);
  	printf(_("Latest checkpoint's oldestXID:        %u\n"),
! 		   ControlFile.checkPointCopy.oldestXid);
  	printf(_("Latest checkpoint's oldestXID's DB:   %u\n"),
! 		   ControlFile.checkPointCopy.oldestXidDB);
  	printf(_("Latest checkpoint's oldestActiveXID:  %u\n"),
! 		   ControlFile.checkPointCopy.oldestActiveXid);
  	printf(_("Latest checkpoint's oldestMultiXid:   %u\n"),
! 		   ControlFile.checkPointCopy.oldestMulti);
  	printf(_("Latest checkpoint's oldestMulti's DB: %u\n"),
! 		   ControlFile.checkPointCopy.oldestMultiDB);
  	printf(_("Latest checkpoint's oldestCommitTsXid:%u\n"),
! 		   ControlFile.checkPointCopy.oldestCommitTsXid);
  	printf(_("Latest checkpoint's newestCommitTsXid:%u\n"),
! 		   ControlFile.checkPointCopy.newestCommitTsXid);
  	printf(_("Time of latest checkpoint:            %s\n"),
  		   ckpttime_str);
  	printf(_("Fake LSN counter for unlogged rels:   %X/%X\n"),
! 		   (uint32) (ControlFile.unloggedLSN >> 32),
! 		   (uint32) ControlFile.unloggedLSN);
  	printf(_("Minimum recovery ending location:     %X/%X\n"),
! 		   (uint32) (ControlFile.minRecoveryPoint >> 32),
! 		   (uint32) ControlFile.minRecoveryPoint);
  	printf(_("Min recovery ending loc's timeline:   %u\n"),
! 		   ControlFile.minRecoveryPointTLI);
  	printf(_("Backup start location:                %X/%X\n"),
! 		   (uint32) (ControlFile.backupStartPoint >> 32),
! 		   (uint32) ControlFile.backupStartPoint);
  	printf(_("Backup end location:                  %X/%X\n"),
! 		   (uint32) (ControlFile.backupEndPoint >> 32),
! 		   (uint32) ControlFile.backupEndPoint);
  	printf(_("End-of-backup record required:        %s\n"),
! 		   ControlFile.backupEndRequired ? _("yes") : _("no"));
  	printf(_("wal_level setting:                    %s\n"),
! 		   wal_level_str(ControlFile.wal_level));
  	printf(_("wal_log_hints setting:                %s\n"),
! 		   ControlFile.wal_log_hints ? _("on") : _("off"));
  	printf(_("max_connections setting:              %d\n"),
! 		   ControlFile.MaxConnections);
  	printf(_("max_worker_processes setting:         %d\n"),
! 		   ControlFile.max_worker_processes);
  	printf(_("max_prepared_xacts setting:           %d\n"),
! 		   ControlFile.max_prepared_xacts);
  	printf(_("max_locks_per_xact setting:           %d\n"),
! 		   ControlFile.max_locks_per_xact);
  	printf(_("track_commit_timestamp setting:       %s\n"),
! 		   ControlFile.track_commit_timestamp ? _("on") : _("off"));
  	printf(_("Maximum data alignment:               %u\n"),
! 		   ControlFile.maxAlign);
  	/* we don't print floatFormat since can't say much useful about it */
  	printf(_("Database block size:                  %u\n"),
! 		   ControlFile.blcksz);
  	printf(_("Blocks per segment of large relation: %u\n"),
! 		   ControlFile.relseg_size);
  	printf(_("WAL block size:                       %u\n"),
! 		   ControlFile.xlog_blcksz);
  	printf(_("Bytes per WAL segment:                %u\n"),
! 		   ControlFile.xlog_seg_size);
  	printf(_("Maximum length of identifiers:        %u\n"),
! 		   ControlFile.nameDataLen);
  	printf(_("Maximum columns in an index:          %u\n"),
! 		   ControlFile.indexMaxKeys);
  	printf(_("Maximum size of a TOAST chunk:        %u\n"),
! 		   ControlFile.toast_max_chunk_size);
  	printf(_("Size of a large-object chunk:         %u\n"),
! 		   ControlFile.loblksize);
  	printf(_("Date/time type storage:               %s\n"),
! 		   (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
  	printf(_("Float4 argument passing:              %s\n"),
! 		   (ControlFile.float4ByVal ? _("by value") : _("by reference")));
  	printf(_("Float8 argument passing:              %s\n"),
! 		   (ControlFile.float8ByVal ? _("by value") : _("by reference")));
  	printf(_("Data page checksum version:           %u\n"),
! 		   ControlFile.data_checksum_version);
  	return 0;
  }
--- 179,307 ----
  	 * Calculate name of the WAL file containing the latest checkpoint's REDO
  	 * start point.
  	 */
! 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
! 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
  
  	/*
  	 * Format system_identifier separately to keep platform-dependent format
  	 * code out of the translatable message string.
  	 */
  	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
! 			 ControlFile->system_identifier);
  
  	printf(_("pg_control version number:            %u\n"),
! 		   ControlFile->pg_control_version);
! 	if (ControlFile->pg_control_version % 65536 == 0 && ControlFile->pg_control_version / 65536 != 0)
  		printf(_("WARNING: possible byte ordering mismatch\n"
  				 "The byte ordering used to store the pg_control file might not match the one\n"
  				 "used by this program.  In that case the results below would be incorrect, and\n"
  				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
  	printf(_("Catalog version number:               %u\n"),
! 		   ControlFile->catalog_version_no);
  	printf(_("Database system identifier:           %s\n"),
  		   sysident_str);
  	printf(_("Database cluster state:               %s\n"),
! 		   dbState(ControlFile->state));
  	printf(_("pg_control last modified:             %s\n"),
  		   pgctime_str);
  	printf(_("Latest checkpoint location:           %X/%X\n"),
! 		   (uint32) (ControlFile->checkPoint >> 32),
! 		   (uint32) ControlFile->checkPoint);
  	printf(_("Prior checkpoint location:            %X/%X\n"),
! 		   (uint32) (ControlFile->prevCheckPoint >> 32),
! 		   (uint32) ControlFile->prevCheckPoint);
  	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
! 		   (uint32) (ControlFile->checkPointCopy.redo >> 32),
! 		   (uint32) ControlFile->checkPointCopy.redo);
  	printf(_("Latest checkpoint's REDO WAL file:    %s\n"),
  		   xlogfilename);
  	printf(_("Latest checkpoint's TimeLineID:       %u\n"),
! 		   ControlFile->checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's PrevTimeLineID:   %u\n"),
! 		   ControlFile->checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
! 		   ControlFile->checkPointCopy.fullPageWrites ? _("on") : _("off"));
  	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
! 		   ControlFile->checkPointCopy.nextXidEpoch,
! 		   ControlFile->checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
! 		   ControlFile->checkPointCopy.nextOid);
  	printf(_("Latest checkpoint's NextMultiXactId:  %u\n"),
! 		   ControlFile->checkPointCopy.nextMulti);
  	printf(_("Latest checkpoint's NextMultiOffset:  %u\n"),
! 		   ControlFile->checkPointCopy.nextMultiOffset);
  	printf(_("Latest checkpoint's oldestXID:        %u\n"),
! 		   ControlFile->checkPointCopy.oldestXid);
  	printf(_("Latest checkpoint's oldestXID's DB:   %u\n"),
! 		   ControlFile->checkPointCopy.oldestXidDB);
  	printf(_("Latest checkpoint's oldestActiveXID:  %u\n"),
! 		   ControlFile->checkPointCopy.oldestActiveXid);
  	printf(_("Latest checkpoint's oldestMultiXid:   %u\n"),
! 		   ControlFile->checkPointCopy.oldestMulti);
  	printf(_("Latest checkpoint's oldestMulti's DB: %u\n"),
! 		   ControlFile->checkPointCopy.oldestMultiDB);
  	printf(_("Latest checkpoint's oldestCommitTsXid:%u\n"),
! 		   ControlFile->checkPointCopy.oldestCommitTsXid);
  	printf(_("Latest checkpoint's newestCommitTsXid:%u\n"),
! 		   ControlFile->checkPointCopy.newestCommitTsXid);
  	printf(_("Time of latest checkpoint:            %s\n"),
  		   ckpttime_str);
  	printf(_("Fake LSN counter for unlogged rels:   %X/%X\n"),
! 		   (uint32) (ControlFile->unloggedLSN >> 32),
! 		   (uint32) ControlFile->unloggedLSN);
  	printf(_("Minimum recovery ending location:     %X/%X\n"),
! 		   (uint32) (ControlFile->minRecoveryPoint >> 32),
! 		   (uint32) ControlFile->minRecoveryPoint);
  	printf(_("Min recovery ending loc's timeline:   %u\n"),
! 		   ControlFile->minRecoveryPointTLI);
  	printf(_("Backup start location:                %X/%X\n"),
! 		   (uint32) (ControlFile->backupStartPoint >> 32),
! 		   (uint32) ControlFile->backupStartPoint);
  	printf(_("Backup end location:                  %X/%X\n"),
! 		   (uint32) (ControlFile->backupEndPoint >> 32),
! 		   (uint32) ControlFile->backupEndPoint);
  	printf(_("End-of-backup record required:        %s\n"),
! 		   ControlFile->backupEndRequired ? _("yes") : _("no"));
  	printf(_("wal_level setting:                    %s\n"),
! 		   wal_level_str(ControlFile->wal_level));
  	printf(_("wal_log_hints setting:                %s\n"),
! 		   ControlFile->wal_log_hints ? _("on") : _("off"));
  	printf(_("max_connections setting:              %d\n"),
! 		   ControlFile->MaxConnections);
  	printf(_("max_worker_processes setting:         %d\n"),
! 		   ControlFile->max_worker_processes);
  	printf(_("max_prepared_xacts setting:           %d\n"),
! 		   ControlFile->max_prepared_xacts);
  	printf(_("max_locks_per_xact setting:           %d\n"),
! 		   ControlFile->max_locks_per_xact);
  	printf(_("track_commit_timestamp setting:       %s\n"),
! 		   ControlFile->track_commit_timestamp ? _("on") : _("off"));
  	printf(_("Maximum data alignment:               %u\n"),
! 		   ControlFile->maxAlign);
  	/* we don't print floatFormat since can't say much useful about it */
  	printf(_("Database block size:                  %u\n"),
! 		   ControlFile->blcksz);
  	printf(_("Blocks per segment of large relation: %u\n"),
! 		   ControlFile->relseg_size);
  	printf(_("WAL block size:                       %u\n"),
! 		   ControlFile->xlog_blcksz);
  	printf(_("Bytes per WAL segment:                %u\n"),
! 		   ControlFile->xlog_seg_size);
  	printf(_("Maximum length of identifiers:        %u\n"),
! 		   ControlFile->nameDataLen);
  	printf(_("Maximum columns in an index:          %u\n"),
! 		   ControlFile->indexMaxKeys);
  	printf(_("Maximum size of a TOAST chunk:        %u\n"),
! 		   ControlFile->toast_max_chunk_size);
  	printf(_("Size of a large-object chunk:         %u\n"),
! 		   ControlFile->loblksize);
  	printf(_("Date/time type storage:               %s\n"),
! 		   (ControlFile->enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
  	printf(_("Float4 argument passing:              %s\n"),
! 		   (ControlFile->float4ByVal ? _("by value") : _("by reference")));
  	printf(_("Float8 argument passing:              %s\n"),
! 		   (ControlFile->float8ByVal ? _("by value") : _("by reference")));
  	printf(_("Data page checksum version:           %u\n"),
! 		   ControlFile->data_checksum_version);
  	return 0;
  }
diff --git a/src/common/Makefile b/src/common/Makefile
index bde4fc2..f7a4a4d 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** override CPPFLAGS += -DVAL_LDFLAGS_EX="\
*** 36,43 ****
  override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
  override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
  
! OBJS_COMMON = config_info.o exec.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 36,43 ----
  override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
  override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
  
! OBJS_COMMON = config_info.o controldata_utils.o exec.o pg_lzcompress.o \
! 	pgfnames.o psprintf.o relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c
index ...a0204a7 .
*** a/src/common/controldata_utils.c
--- b/src/common/controldata_utils.c
***************
*** 0 ****
--- 1,88 ----
+ /*-------------------------------------------------------------------------
+  *
+  * controldata_utils.c
+  *		Common code for pg_controldata output
+  *
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *
+  * IDENTIFICATION
+  *	  src/common/controldata_utils.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ #ifndef FRONTEND
+ #include "postgres.h"
+ #else
+ #include "postgres_fe.h"
+ #endif
+ 
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+ #include "catalog/pg_control.h"
+ #include "common/controldata_utils.h"
+ #include "port/pg_crc32c.h"
+ 
+ #ifndef FRONTEND
+ /* NOTE: caller must provide gettext call around str */
+ #define log_error(str, param1, param2)	\
+ 	elog(ERROR, str, param1, param2)
+ #else
+ #define log_error(str, param1, param2)	\
+ 	do { \
+ 			char *buf = psprintf("%%s: %s", str); \
+ 			fprintf(stderr, buf, progname, param1, param2); \
+ 			exit(2); \
+ 	} while (0)
+ #endif
+ 
+ /*
+  * get_controlfile(char *DataDir, const char *progname)
+  *
+  * Get controlfile values. The caller is responsible
+  * for pfreeing the result.
+  */
+ ControlFileData *
+ get_controlfile(char *DataDir, const char *progname)
+ {
+ 	ControlFileData	   *ControlFile;
+ 	int					fd;
+ 	char				ControlFilePath[MAXPGPATH];
+ 	pg_crc32c			crc;
+ 
+ 	ControlFile = palloc(sizeof(ControlFileData));
+ 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
+ 
+ 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
+ 		log_error(_("could not open file \"%s\" for reading: %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
+ 		log_error(_("could not read file \"%s\": %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	close(fd);
+ 
+ 	/* Check the CRC. */
+ 	INIT_CRC32C(crc);
+ 	COMP_CRC32C(crc,
+ 			   (char *) ControlFile,
+ 			   offsetof(ControlFileData, crc));
+ 	FIN_CRC32C(crc);
+ 
+ 	if (!EQ_CRC32C(crc, ControlFile->crc))
+ #ifndef FRONTEND
+ 		elog(ERROR, _("calculated CRC checksum does not match value stored in file"));
+ #else
+ 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
+ 				 "Either the file is corrupt, or it has a different layout than this program\n"
+ 				 "is expecting.  The results below are untrustworthy.\n\n"));
+ #endif
+ 
+ 	return ControlFile;
+ }
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 62b9125..e22bfd3 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("row security for current context
*** 5216,5221 ****
--- 5216,5234 ----
  DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
  DESCR("pg_config binary as a function");
  
+ /* pg_controldata related functions */
+ DATA(insert OID = 3441 ( pg_control_system PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,20,1184}" "{o,o,o,o}" "{pg_control_version,catalog_version_no,system_identifier,pg_control_last_modified}" _null_ _null_ pg_control_system _null_ _null_ _null_ ));
+ DESCR("pg_controldata general state information as a function");
+ 
+ DATA(insert OID = 3442 ( pg_control_checkpoint PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,3220,3220,25,23,23,16,25,26,28,28,28,26,28,28,26,28,28,1184}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{checkpoint_location,prior_location,redo_location,redo_wal_file,timeline_id,prev_timeline_id,full_page_writes,next_xid,next_oid,next_multixact_id,next_multi_offset,oldest_xid,oldest_xid_dbid,oldest_active_xid,oldest_multi_xid,oldest_multi_dbid,oldest_commit_ts_xid,newest_commit_ts_xid,checkpoint_time}" _null_ _null_ pg_control_checkpoint _null_ _null_ _null_ ));
+ DESCR("pg_controldata checkpoint state information as a function");
+ 
+ DATA(insert OID = 3443 ( pg_control_recovery PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,23,3220,3220,16}" "{o,o,o,o,o}" "{min_recovery_end_location,min_recovery_end_timeline,backup_start_location,backup_end_location,end_of_backup_record_required}" _null_ _null_ pg_control_recovery _null_ _null_ _null_ ));
+ DESCR("pg_controldata recovery state information as a function");
+ 
+ DATA(insert OID = 3444 ( pg_control_init PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,23,23,23,23,23,23,23,16,16,16,23}" "{o,o,o,o,o,o,o,o,o,o,o,o,o}" "{max_data_alignment,database_block_size,blocks_per_segment,wal_block_size,bytes_per_wal_segment,max_identifier_length,max_index_columns,max_toast_chunk_size,large_object_chunk_size,bigint_timestamps,float4_pass_by_value,float8_pass_by_value,data_page_checksum_version}" _null_ _null_ pg_control_init _null_ _null_ _null_ ));
+ DESCR("pg_controldata init state information as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/common/controldata_utils.h b/src/include/common/controldata_utils.h
index ...1a09765 .
*** a/src/include/common/controldata_utils.h
--- b/src/include/common/controldata_utils.h
***************
*** 0 ****
--- 1,15 ----
+ /*
+  * controldata_utils.h
+  *		Common code for pg_controldata output
+  *
+  *	Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  *	Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *	src/include/common/controldata_utils.h
+  */
+ #ifndef COMMON_CONTROLDATA_UTILS_H
+ #define COMMON_CONTROLDATA_UTILS_H
+ 
+ extern ControlFileData *get_controlfile(char *DataDir, const char *progname);
+ 
+ #endif   /* COMMON_CONTROLDATA_UTILS_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 7ec93c9..115f8af 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum show_all_file_settings(PG_F
*** 1151,1156 ****
--- 1151,1162 ----
  /* pg_config.c */
  extern Datum pg_config(PG_FUNCTION_ARGS);
  
+ /* pg_controldata.c */
+ extern Datum pg_control_checkpoint(PG_FUNCTION_ARGS);
+ extern Datum pg_control_system(PG_FUNCTION_ARGS);
+ extern Datum pg_control_init(PG_FUNCTION_ARGS);
+ extern Datum pg_control_recovery(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index e4fb44e..1a9c996 100644
*** a/src/tools/msvc/Mkvcbuild.pm
--- b/src/tools/msvc/Mkvcbuild.pm
*************** sub mkvcbuild
*** 106,112 ****
  	}
  
  	our @pgcommonallfiles = qw(
! 	  config_info.c exec.c pg_lzcompress.c pgfnames.c psprintf.c
  	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
--- 106,112 ----
  	}
  
  	our @pgcommonallfiles = qw(
! 	  config_info.c controldata_utils.c exec.c pg_lzcompress.c pgfnames.c
  	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index c0b94bc..4b5ee81 100644
*** a/doc/src/sgml/func.sgml
--- b/doc/src/sgml/func.sgml
*************** SELECT collation for ('foo' COLLATE "de_
*** 16703,16708 ****
--- 16703,17064 ----
      </tgroup>
     </table>
  
+    <para>
+     The functions shown in <xref linkend="functions-controldata">
+     print information initialized during <command>initdb</>, such
+     as the catalog version. They also show information about write-ahead
+     logging and checkpoint processing. This information is cluster-wide,
+     and not specific to any one database. They provide most of the same
+     information, from the same source, as
+     <xref linkend="APP-PGCONTROLDATA">, although in a form better suited
+     to <acronym>SQL</acronym> functions.
+    </para>
+ 
+    <table id="functions-controldata">
+     <title>Control Data Functions</title>
+     <tgroup cols="3">
+      <thead>
+       <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry></row>
+      </thead>
+ 
+      <tbody>
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_checkpoint</primary></indexterm>
+         <literal><function>pg_control_checkpoint()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about current checkpoint state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_system</primary></indexterm>
+         <literal><function>pg_control_system()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about current controldata file state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_init</primary></indexterm>
+         <literal><function>pg_control_init()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about cluster initialization state.
+        </entry>
+       </row>
+ 
+       <row>
+        <entry>
+         <indexterm><primary>pg_control_recovery</primary></indexterm>
+         <literal><function>pg_control_recovery()</function></literal>
+        </entry>
+        <entry><type>record</type></entry>
+        <entry>
+         Returns information about recovery state.
+        </entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_checkpoint</> returns a record, shown in
+     <xref linkend="functions-pg-control-checkpoint">
+    </para>
+ 
+    <table id="functions-pg-control-checkpoint">
+     <title><function>pg_control_checkpoint</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>checkpoint_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>prior_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>redo_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>redo_wal_file</entry>
+        <entry><type>text</type></entry>
+       </row>
+ 
+       <row>
+        <entry>timeline_id</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>prev_timeline_id</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>full_page_writes</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_xid</entry>
+        <entry><type>text</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_oid</entry>
+        <entry><type>oid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_multixact_id</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>next_multi_offset</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_xid_dbid</entry>
+        <entry><type>oid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_active_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_multi_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_multi_dbid</entry>
+        <entry><type>oid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>oldest_commit_ts_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>newest_commit_ts_xid</entry>
+        <entry><type>xid</type></entry>
+       </row>
+ 
+       <row>
+        <entry>checkpoint_time</entry>
+        <entry><type>timestamp with time zone</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_system</> returns a record, shown in
+     <xref linkend="functions-pg-control-system">
+    </para>
+ 
+    <table id="functions-pg-control-system">
+     <title><function>pg_control_system</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>pg_control_version</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>catalog_version_no</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>system_identifier</entry>
+        <entry><type>bigint</type></entry>
+       </row>
+ 
+       <row>
+        <entry>pg_control_last_modified</entry>
+        <entry><type>timestamp with time zone</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_init</> returns a record, shown in
+     <xref linkend="functions-pg-control-init">
+    </para>
+ 
+    <table id="functions-pg-control-init">
+     <title><function>pg_control_init</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>max_data_alignment</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>database_block_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>blocks_per_segment</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>wal_block_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>bytes_per_wal_segment</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>max_identifier_length</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>max_index_columns</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>max_toast_chunk_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>large_object_chunk_size</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>bigint_timestamps</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>float4_pass_by_value</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>float8_pass_by_value</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+       <row>
+        <entry>data_page_checksum_version</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
+    <para>
+     <function>pg_control_recovery</> returns a record, shown in
+     <xref linkend="functions-pg-control-recovery">
+    </para>
+ 
+    <table id="functions-pg-control-recovery">
+     <title><function>pg_control_recovery</> Columns</title>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>Column Name</entry>
+        <entry>Data Type</entry>
+       </row>
+      </thead>
+ 
+      <tbody>
+ 
+       <row>
+        <entry>min_recovery_end_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>min_recovery_end_timeline</entry>
+        <entry><type>integer</type></entry>
+       </row>
+ 
+       <row>
+        <entry>backup_start_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>backup_end_location</entry>
+        <entry><type>pg_lsn</type></entry>
+       </row>
+ 
+       <row>
+        <entry>end_of_backup_record_required</entry>
+        <entry><type>boolean</type></entry>
+       </row>
+ 
+      </tbody>
+     </tgroup>
+    </table>
+ 
    </sect1>
  
    <sect1 id="functions-admin">
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index a0c82c1..a5b487d 100644
*** a/src/backend/utils/misc/Makefile
--- b/src/backend/utils/misc/Makefile
*************** include $(top_builddir)/src/Makefile.glo
*** 14,20 ****
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
         ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
--- 14,20 ----
  
  override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
  
! OBJS = guc.o help_config.o pg_config.o pg_controldata.o pg_rusage.o \
         ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
  
  # This location might depend on the installation directories. Therefore
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index ...8552c07 .
*** a/src/backend/utils/misc/pg_controldata.c
--- b/src/backend/utils/misc/pg_controldata.c
***************
*** 0 ****
--- 1,341 ----
+ /*-------------------------------------------------------------------------
+  *
+  * pg_controldata.c
+  *
+  * Routines to expose the contents of the control data file via
+  * a set of SQL functions.
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  * IDENTIFICATION
+  *	  src/backend/utils/misc/pg_controldata.c
+  *-------------------------------------------------------------------------
+  */
+ 
+ #include "postgres.h"
+ 
+ #include "funcapi.h"
+ #include "miscadmin.h"
+ #include "access/htup_details.h"
+ #include "access/xlog_internal.h"
+ #include "catalog/pg_control.h"
+ #include "catalog/pg_type.h"
+ #include "common/controldata_utils.h"
+ #include "utils/builtins.h"
+ #include "utils/pg_lsn.h"
+ #include "utils/timestamp.h"
+ 
+ Datum
+ pg_control_system(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[4];
+ 	bool				nulls[4];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(4, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pg_control_version",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "catalog_version_no",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "system_identifier",
+ 					   INT8OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "pg_control_last_modified",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	values[0] = Int32GetDatum(ControlFile->pg_control_version);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->catalog_version_no);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int64GetDatum(ControlFile->system_identifier);
+ 	nulls[2] = false;
+ 
+ 	values[3] = TimestampTzGetDatum(time_t_to_timestamptz(ControlFile->time));
+ 	nulls[3] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_control_checkpoint(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[19];
+ 	bool				nulls[19];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 	XLogSegNo			segno;
+ 	char				xlogfilename[MAXFNAMELEN];
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(19, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "checkpoint_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "prior_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "redo_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "redo_wal_file",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "prev_timeline_id",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "full_page_writes",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "next_xid",
+ 					   TEXTOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "next_oid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "next_multixact_id",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "next_multi_offset",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "oldest_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "oldest_xid_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 14, "oldest_active_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 15, "oldest_multi_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 16, "oldest_multi_dbid",
+ 					   OIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 17, "oldest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 18, "newest_commit_ts_xid",
+ 					   XIDOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 19, "checkpoint_time",
+ 					   TIMESTAMPTZOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* Read the control file. */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	/*
+ 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
+ 	 * start point.
+ 	 */
+ 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
+ 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+ 
+ 	/* Populate the values and null arrays */
+ 	values[0] = LSNGetDatum(ControlFile->checkPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = LSNGetDatum(ControlFile->prevCheckPoint);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->checkPointCopy.redo);
+ 	nulls[2] = false;
+ 
+ 	values[3] = CStringGetTextDatum(xlogfilename);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->checkPointCopy.ThisTimeLineID);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->checkPointCopy.PrevTimeLineID);
+ 	nulls[5] = false;
+ 
+ 	values[6] = BoolGetDatum(ControlFile->checkPointCopy.fullPageWrites);
+ 	nulls[6] = false;
+ 
+ 	values[7] = CStringGetTextDatum(psprintf("%u:%u",
+ 								ControlFile->checkPointCopy.nextXidEpoch,
+ 								ControlFile->checkPointCopy.nextXid));
+ 	nulls[7] = false;
+ 
+ 	values[8] = ObjectIdGetDatum(ControlFile->checkPointCopy.nextOid);
+ 	nulls[8] = false;
+ 
+ 	values[9] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMulti);
+ 	nulls[9] = false;
+ 
+ 	values[10] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMultiOffset);
+ 	nulls[10] = false;
+ 
+ 	values[11] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestXid);
+ 	nulls[11] = false;
+ 
+ 	values[12] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestXidDB);
+ 	nulls[12] = false;
+ 
+ 	values[13] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestActiveXid);
+ 	nulls[13] = false;
+ 
+ 	values[14] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestMulti);
+ 	nulls[14] = false;
+ 
+ 	values[15] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestMultiDB);
+ 	nulls[15] = false;
+ 
+ 	values[16] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestCommitTsXid);
+ 	nulls[16] = false;
+ 
+ 	values[17] = TransactionIdGetDatum(ControlFile->checkPointCopy.newestCommitTsXid);
+ 	nulls[17] = false;
+ 
+ 	values[18] = TimestampTzGetDatum(
+ 					time_t_to_timestamptz(ControlFile->checkPointCopy.time));
+ 	nulls[18] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_control_recovery(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[5];
+ 	bool				nulls[5];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(5, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "min_recovery_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "min_recovery_end_timeline",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "backup_start_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "backup_end_location",
+ 					   LSNOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "end_of_backup_record_required",
+ 					   BOOLOID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	values[0] = LSNGetDatum(ControlFile->minRecoveryPoint);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->minRecoveryPointTLI);
+ 	nulls[1] = false;
+ 
+ 	values[2] = LSNGetDatum(ControlFile->backupStartPoint);
+ 	nulls[2] = false;
+ 
+ 	values[3] = LSNGetDatum(ControlFile->backupEndPoint);
+ 	nulls[3] = false;
+ 
+ 	values[4] = BoolGetDatum(ControlFile->backupEndRequired);
+ 	nulls[4] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
+ 
+ Datum
+ pg_control_init(PG_FUNCTION_ARGS)
+ {
+ 	Datum				values[13];
+ 	bool				nulls[13];
+ 	TupleDesc			tupdesc;
+ 	HeapTuple			htup;
+ 	ControlFileData	   *ControlFile;
+ 
+ 	/*
+ 	 * Construct a tuple descriptor for the result row.  This must match this
+ 	 * function's pg_proc entry!
+ 	 */
+ 	tupdesc = CreateTemplateTupleDesc(13, false);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "max_data_alignment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "database_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "blocks_per_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "wal_block_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "bytes_per_wal_segment",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "max_identifier_length",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "max_index_columns",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "max_toast_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "large_object_chunk_size",
+ 					   INT4OID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "bigint_timestamps",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "float4_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "float8_pass_by_value",
+ 					   BOOLOID, -1, 0);
+ 	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "data_page_checksum_version",
+ 					   INT4OID, -1, 0);
+ 	tupdesc = BlessTupleDesc(tupdesc);
+ 
+ 	/* read the control file */
+ 	ControlFile = get_controlfile(DataDir, NULL);
+ 
+ 	values[0] = Int32GetDatum(ControlFile->maxAlign);
+ 	nulls[0] = false;
+ 
+ 	values[1] = Int32GetDatum(ControlFile->blcksz);
+ 	nulls[1] = false;
+ 
+ 	values[2] = Int32GetDatum(ControlFile->relseg_size);
+ 	nulls[2] = false;
+ 
+ 	values[3] = Int32GetDatum(ControlFile->xlog_blcksz);
+ 	nulls[3] = false;
+ 
+ 	values[4] = Int32GetDatum(ControlFile->xlog_seg_size);
+ 	nulls[4] = false;
+ 
+ 	values[5] = Int32GetDatum(ControlFile->nameDataLen);
+ 	nulls[5] = false;
+ 
+ 	values[6] = Int32GetDatum(ControlFile->indexMaxKeys);
+ 	nulls[6] = false;
+ 
+ 	values[7] = Int32GetDatum(ControlFile->toast_max_chunk_size);
+ 	nulls[7] = false;
+ 
+ 	values[8] = Int32GetDatum(ControlFile->loblksize);
+ 	nulls[8] = false;
+ 
+ 	values[9] = BoolGetDatum(ControlFile->enableIntTimes);
+ 	nulls[9] = false;
+ 
+ 	values[10] = BoolGetDatum(ControlFile->float4ByVal);
+ 	nulls[10] = false;
+ 
+ 	values[11] = BoolGetDatum(ControlFile->float8ByVal);
+ 	nulls[11] = false;
+ 
+ 	values[12] = Int32GetDatum(ControlFile->data_checksum_version);
+ 	nulls[12] = false;
+ 
+ 	htup = heap_form_tuple(tupdesc, values, nulls);
+ 
+ 	PG_RETURN_DATUM(HeapTupleGetDatum(htup));
+ }
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 5dd2dbc..fdf7c7d 100644
*** a/src/bin/pg_controldata/pg_controldata.c
--- b/src/bin/pg_controldata/pg_controldata.c
***************
*** 18,31 ****
  
  #include "postgres.h"
  
- #include <unistd.h>
  #include <time.h>
- #include <sys/stat.h>
- #include <fcntl.h>
  
  #include "access/xlog.h"
  #include "access/xlog_internal.h"
  #include "catalog/pg_control.h"
  #include "pg_getopt.h"
  
  
--- 18,29 ----
  
  #include "postgres.h"
  
  #include <time.h>
  
  #include "access/xlog.h"
  #include "access/xlog_internal.h"
  #include "catalog/pg_control.h"
+ #include "common/controldata_utils.h"
  #include "pg_getopt.h"
  
  
*************** wal_level_str(WalLevel wal_level)
*** 89,99 ****
  int
  main(int argc, char *argv[])
  {
! 	ControlFileData ControlFile;
! 	int			fd;
! 	char		ControlFilePath[MAXPGPATH];
  	char	   *DataDir = NULL;
- 	pg_crc32c	crc;
  	time_t		time_tmp;
  	char		pgctime_str[128];
  	char		ckpttime_str[128];
--- 87,94 ----
  int
  main(int argc, char *argv[])
  {
! 	ControlFileData *ControlFile;
  	char	   *DataDir = NULL;
  	time_t		time_tmp;
  	char		pgctime_str[128];
  	char		ckpttime_str[128];
*************** main(int argc, char *argv[])
*** 161,194 ****
  		exit(1);
  	}
  
! 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
! 
! 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
! 	{
! 		fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
! 	}
! 
! 	if (read(fd, &ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
! 	{
! 		fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
! 				progname, ControlFilePath, strerror(errno));
! 		exit(2);
! 	}
! 	close(fd);
! 
! 	/* Check the CRC. */
! 	INIT_CRC32C(crc);
! 	COMP_CRC32C(crc,
! 				(char *) &ControlFile,
! 				offsetof(ControlFileData, crc));
! 	FIN_CRC32C(crc);
! 
! 	if (!EQ_CRC32C(crc, ControlFile.crc))
! 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
! 				 "Either the file is corrupt, or it has a different layout than this program\n"
! 				 "is expecting.  The results below are untrustworthy.\n\n"));
  
  	/*
  	 * This slightly-chintzy coding will work as long as the control file
--- 156,163 ----
  		exit(1);
  	}
  
! 	/* get a copy of the control file */
! 	ControlFile = get_controlfile(DataDir, progname);
  
  	/*
  	 * This slightly-chintzy coding will work as long as the control file
*************** main(int argc, char *argv[])
*** 199,208 ****
  	 * Use variable for format to suppress overly-anal-retentive gcc warning
  	 * about %c
  	 */
! 	time_tmp = (time_t) ControlFile.time;
  	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
  			 localtime(&time_tmp));
! 	time_tmp = (time_t) ControlFile.checkPointCopy.time;
  	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
  			 localtime(&time_tmp));
  
--- 168,177 ----
  	 * Use variable for format to suppress overly-anal-retentive gcc warning
  	 * about %c
  	 */
! 	time_tmp = (time_t) ControlFile->time;
  	strftime(pgctime_str, sizeof(pgctime_str), strftime_fmt,
  			 localtime(&time_tmp));
! 	time_tmp = (time_t) ControlFile->checkPointCopy.time;
  	strftime(ckpttime_str, sizeof(ckpttime_str), strftime_fmt,
  			 localtime(&time_tmp));
  
*************** main(int argc, char *argv[])
*** 210,338 ****
  	 * Calculate name of the WAL file containing the latest checkpoint's REDO
  	 * start point.
  	 */
! 	XLByteToSeg(ControlFile.checkPointCopy.redo, segno);
! 	XLogFileName(xlogfilename, ControlFile.checkPointCopy.ThisTimeLineID, segno);
  
  	/*
  	 * Format system_identifier separately to keep platform-dependent format
  	 * code out of the translatable message string.
  	 */
  	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
! 			 ControlFile.system_identifier);
  
  	printf(_("pg_control version number:            %u\n"),
! 		   ControlFile.pg_control_version);
! 	if (ControlFile.pg_control_version % 65536 == 0 && ControlFile.pg_control_version / 65536 != 0)
! 		printf(_("WARNING: possible byte ordering mismatch\n"
! 				 "The byte ordering used to store the pg_control file might not match the one\n"
! 				 "used by this program.  In that case the results below would be incorrect, and\n"
! 				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
  	printf(_("Catalog version number:               %u\n"),
! 		   ControlFile.catalog_version_no);
  	printf(_("Database system identifier:           %s\n"),
  		   sysident_str);
  	printf(_("Database cluster state:               %s\n"),
! 		   dbState(ControlFile.state));
  	printf(_("pg_control last modified:             %s\n"),
  		   pgctime_str);
  	printf(_("Latest checkpoint location:           %X/%X\n"),
! 		   (uint32) (ControlFile.checkPoint >> 32),
! 		   (uint32) ControlFile.checkPoint);
  	printf(_("Prior checkpoint location:            %X/%X\n"),
! 		   (uint32) (ControlFile.prevCheckPoint >> 32),
! 		   (uint32) ControlFile.prevCheckPoint);
  	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
! 		   (uint32) (ControlFile.checkPointCopy.redo >> 32),
! 		   (uint32) ControlFile.checkPointCopy.redo);
  	printf(_("Latest checkpoint's REDO WAL file:    %s\n"),
  		   xlogfilename);
  	printf(_("Latest checkpoint's TimeLineID:       %u\n"),
! 		   ControlFile.checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's PrevTimeLineID:   %u\n"),
! 		   ControlFile.checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
! 		   ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
  	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
! 		   ControlFile.checkPointCopy.nextXidEpoch,
! 		   ControlFile.checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
! 		   ControlFile.checkPointCopy.nextOid);
  	printf(_("Latest checkpoint's NextMultiXactId:  %u\n"),
! 		   ControlFile.checkPointCopy.nextMulti);
  	printf(_("Latest checkpoint's NextMultiOffset:  %u\n"),
! 		   ControlFile.checkPointCopy.nextMultiOffset);
  	printf(_("Latest checkpoint's oldestXID:        %u\n"),
! 		   ControlFile.checkPointCopy.oldestXid);
  	printf(_("Latest checkpoint's oldestXID's DB:   %u\n"),
! 		   ControlFile.checkPointCopy.oldestXidDB);
  	printf(_("Latest checkpoint's oldestActiveXID:  %u\n"),
! 		   ControlFile.checkPointCopy.oldestActiveXid);
  	printf(_("Latest checkpoint's oldestMultiXid:   %u\n"),
! 		   ControlFile.checkPointCopy.oldestMulti);
  	printf(_("Latest checkpoint's oldestMulti's DB: %u\n"),
! 		   ControlFile.checkPointCopy.oldestMultiDB);
  	printf(_("Latest checkpoint's oldestCommitTsXid:%u\n"),
! 		   ControlFile.checkPointCopy.oldestCommitTsXid);
  	printf(_("Latest checkpoint's newestCommitTsXid:%u\n"),
! 		   ControlFile.checkPointCopy.newestCommitTsXid);
  	printf(_("Time of latest checkpoint:            %s\n"),
  		   ckpttime_str);
  	printf(_("Fake LSN counter for unlogged rels:   %X/%X\n"),
! 		   (uint32) (ControlFile.unloggedLSN >> 32),
! 		   (uint32) ControlFile.unloggedLSN);
  	printf(_("Minimum recovery ending location:     %X/%X\n"),
! 		   (uint32) (ControlFile.minRecoveryPoint >> 32),
! 		   (uint32) ControlFile.minRecoveryPoint);
  	printf(_("Min recovery ending loc's timeline:   %u\n"),
! 		   ControlFile.minRecoveryPointTLI);
  	printf(_("Backup start location:                %X/%X\n"),
! 		   (uint32) (ControlFile.backupStartPoint >> 32),
! 		   (uint32) ControlFile.backupStartPoint);
  	printf(_("Backup end location:                  %X/%X\n"),
! 		   (uint32) (ControlFile.backupEndPoint >> 32),
! 		   (uint32) ControlFile.backupEndPoint);
  	printf(_("End-of-backup record required:        %s\n"),
! 		   ControlFile.backupEndRequired ? _("yes") : _("no"));
  	printf(_("wal_level setting:                    %s\n"),
! 		   wal_level_str(ControlFile.wal_level));
  	printf(_("wal_log_hints setting:                %s\n"),
! 		   ControlFile.wal_log_hints ? _("on") : _("off"));
  	printf(_("max_connections setting:              %d\n"),
! 		   ControlFile.MaxConnections);
  	printf(_("max_worker_processes setting:         %d\n"),
! 		   ControlFile.max_worker_processes);
  	printf(_("max_prepared_xacts setting:           %d\n"),
! 		   ControlFile.max_prepared_xacts);
  	printf(_("max_locks_per_xact setting:           %d\n"),
! 		   ControlFile.max_locks_per_xact);
  	printf(_("track_commit_timestamp setting:       %s\n"),
! 		   ControlFile.track_commit_timestamp ? _("on") : _("off"));
  	printf(_("Maximum data alignment:               %u\n"),
! 		   ControlFile.maxAlign);
  	/* we don't print floatFormat since can't say much useful about it */
  	printf(_("Database block size:                  %u\n"),
! 		   ControlFile.blcksz);
  	printf(_("Blocks per segment of large relation: %u\n"),
! 		   ControlFile.relseg_size);
  	printf(_("WAL block size:                       %u\n"),
! 		   ControlFile.xlog_blcksz);
  	printf(_("Bytes per WAL segment:                %u\n"),
! 		   ControlFile.xlog_seg_size);
  	printf(_("Maximum length of identifiers:        %u\n"),
! 		   ControlFile.nameDataLen);
  	printf(_("Maximum columns in an index:          %u\n"),
! 		   ControlFile.indexMaxKeys);
  	printf(_("Maximum size of a TOAST chunk:        %u\n"),
! 		   ControlFile.toast_max_chunk_size);
  	printf(_("Size of a large-object chunk:         %u\n"),
! 		   ControlFile.loblksize);
  	printf(_("Date/time type storage:               %s\n"),
! 		   (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
  	printf(_("Float4 argument passing:              %s\n"),
! 		   (ControlFile.float4ByVal ? _("by value") : _("by reference")));
  	printf(_("Float8 argument passing:              %s\n"),
! 		   (ControlFile.float8ByVal ? _("by value") : _("by reference")));
  	printf(_("Data page checksum version:           %u\n"),
! 		   ControlFile.data_checksum_version);
  	return 0;
  }
--- 179,302 ----
  	 * Calculate name of the WAL file containing the latest checkpoint's REDO
  	 * start point.
  	 */
! 	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
! 	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
  
  	/*
  	 * Format system_identifier separately to keep platform-dependent format
  	 * code out of the translatable message string.
  	 */
  	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
! 			 ControlFile->system_identifier);
  
  	printf(_("pg_control version number:            %u\n"),
! 		   ControlFile->pg_control_version);
  	printf(_("Catalog version number:               %u\n"),
! 		   ControlFile->catalog_version_no);
  	printf(_("Database system identifier:           %s\n"),
  		   sysident_str);
  	printf(_("Database cluster state:               %s\n"),
! 		   dbState(ControlFile->state));
  	printf(_("pg_control last modified:             %s\n"),
  		   pgctime_str);
  	printf(_("Latest checkpoint location:           %X/%X\n"),
! 		   (uint32) (ControlFile->checkPoint >> 32),
! 		   (uint32) ControlFile->checkPoint);
  	printf(_("Prior checkpoint location:            %X/%X\n"),
! 		   (uint32) (ControlFile->prevCheckPoint >> 32),
! 		   (uint32) ControlFile->prevCheckPoint);
  	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
! 		   (uint32) (ControlFile->checkPointCopy.redo >> 32),
! 		   (uint32) ControlFile->checkPointCopy.redo);
  	printf(_("Latest checkpoint's REDO WAL file:    %s\n"),
  		   xlogfilename);
  	printf(_("Latest checkpoint's TimeLineID:       %u\n"),
! 		   ControlFile->checkPointCopy.ThisTimeLineID);
  	printf(_("Latest checkpoint's PrevTimeLineID:   %u\n"),
! 		   ControlFile->checkPointCopy.PrevTimeLineID);
  	printf(_("Latest checkpoint's full_page_writes: %s\n"),
! 		   ControlFile->checkPointCopy.fullPageWrites ? _("on") : _("off"));
  	printf(_("Latest checkpoint's NextXID:          %u:%u\n"),
! 		   ControlFile->checkPointCopy.nextXidEpoch,
! 		   ControlFile->checkPointCopy.nextXid);
  	printf(_("Latest checkpoint's NextOID:          %u\n"),
! 		   ControlFile->checkPointCopy.nextOid);
  	printf(_("Latest checkpoint's NextMultiXactId:  %u\n"),
! 		   ControlFile->checkPointCopy.nextMulti);
  	printf(_("Latest checkpoint's NextMultiOffset:  %u\n"),
! 		   ControlFile->checkPointCopy.nextMultiOffset);
  	printf(_("Latest checkpoint's oldestXID:        %u\n"),
! 		   ControlFile->checkPointCopy.oldestXid);
  	printf(_("Latest checkpoint's oldestXID's DB:   %u\n"),
! 		   ControlFile->checkPointCopy.oldestXidDB);
  	printf(_("Latest checkpoint's oldestActiveXID:  %u\n"),
! 		   ControlFile->checkPointCopy.oldestActiveXid);
  	printf(_("Latest checkpoint's oldestMultiXid:   %u\n"),
! 		   ControlFile->checkPointCopy.oldestMulti);
  	printf(_("Latest checkpoint's oldestMulti's DB: %u\n"),
! 		   ControlFile->checkPointCopy.oldestMultiDB);
  	printf(_("Latest checkpoint's oldestCommitTsXid:%u\n"),
! 		   ControlFile->checkPointCopy.oldestCommitTsXid);
  	printf(_("Latest checkpoint's newestCommitTsXid:%u\n"),
! 		   ControlFile->checkPointCopy.newestCommitTsXid);
  	printf(_("Time of latest checkpoint:            %s\n"),
  		   ckpttime_str);
  	printf(_("Fake LSN counter for unlogged rels:   %X/%X\n"),
! 		   (uint32) (ControlFile->unloggedLSN >> 32),
! 		   (uint32) ControlFile->unloggedLSN);
  	printf(_("Minimum recovery ending location:     %X/%X\n"),
! 		   (uint32) (ControlFile->minRecoveryPoint >> 32),
! 		   (uint32) ControlFile->minRecoveryPoint);
  	printf(_("Min recovery ending loc's timeline:   %u\n"),
! 		   ControlFile->minRecoveryPointTLI);
  	printf(_("Backup start location:                %X/%X\n"),
! 		   (uint32) (ControlFile->backupStartPoint >> 32),
! 		   (uint32) ControlFile->backupStartPoint);
  	printf(_("Backup end location:                  %X/%X\n"),
! 		   (uint32) (ControlFile->backupEndPoint >> 32),
! 		   (uint32) ControlFile->backupEndPoint);
  	printf(_("End-of-backup record required:        %s\n"),
! 		   ControlFile->backupEndRequired ? _("yes") : _("no"));
  	printf(_("wal_level setting:                    %s\n"),
! 		   wal_level_str(ControlFile->wal_level));
  	printf(_("wal_log_hints setting:                %s\n"),
! 		   ControlFile->wal_log_hints ? _("on") : _("off"));
  	printf(_("max_connections setting:              %d\n"),
! 		   ControlFile->MaxConnections);
  	printf(_("max_worker_processes setting:         %d\n"),
! 		   ControlFile->max_worker_processes);
  	printf(_("max_prepared_xacts setting:           %d\n"),
! 		   ControlFile->max_prepared_xacts);
  	printf(_("max_locks_per_xact setting:           %d\n"),
! 		   ControlFile->max_locks_per_xact);
  	printf(_("track_commit_timestamp setting:       %s\n"),
! 		   ControlFile->track_commit_timestamp ? _("on") : _("off"));
  	printf(_("Maximum data alignment:               %u\n"),
! 		   ControlFile->maxAlign);
  	/* we don't print floatFormat since can't say much useful about it */
  	printf(_("Database block size:                  %u\n"),
! 		   ControlFile->blcksz);
  	printf(_("Blocks per segment of large relation: %u\n"),
! 		   ControlFile->relseg_size);
  	printf(_("WAL block size:                       %u\n"),
! 		   ControlFile->xlog_blcksz);
  	printf(_("Bytes per WAL segment:                %u\n"),
! 		   ControlFile->xlog_seg_size);
  	printf(_("Maximum length of identifiers:        %u\n"),
! 		   ControlFile->nameDataLen);
  	printf(_("Maximum columns in an index:          %u\n"),
! 		   ControlFile->indexMaxKeys);
  	printf(_("Maximum size of a TOAST chunk:        %u\n"),
! 		   ControlFile->toast_max_chunk_size);
  	printf(_("Size of a large-object chunk:         %u\n"),
! 		   ControlFile->loblksize);
  	printf(_("Date/time type storage:               %s\n"),
! 		   (ControlFile->enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
  	printf(_("Float4 argument passing:              %s\n"),
! 		   (ControlFile->float4ByVal ? _("by value") : _("by reference")));
  	printf(_("Float8 argument passing:              %s\n"),
! 		   (ControlFile->float8ByVal ? _("by value") : _("by reference")));
  	printf(_("Data page checksum version:           %u\n"),
! 		   ControlFile->data_checksum_version);
  	return 0;
  }
diff --git a/src/common/Makefile b/src/common/Makefile
index bde4fc2..f7a4a4d 100644
*** a/src/common/Makefile
--- b/src/common/Makefile
*************** override CPPFLAGS += -DVAL_LDFLAGS_EX="\
*** 36,43 ****
  override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
  override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
  
! OBJS_COMMON = config_info.o exec.o pg_lzcompress.o pgfnames.o psprintf.o \
! 	relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
--- 36,43 ----
  override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
  override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
  
! OBJS_COMMON = config_info.o controldata_utils.o exec.o pg_lzcompress.o \
! 	pgfnames.o psprintf.o relpath.o rmtree.o string.o username.o wait_error.o
  
  OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
  
diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c
index ...b6d0a12 .
*** a/src/common/controldata_utils.c
--- b/src/common/controldata_utils.c
***************
*** 0 ****
--- 1,100 ----
+ /*-------------------------------------------------------------------------
+  *
+  * controldata_utils.c
+  *		Common code for control data file output.
+  *
+  *
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  * Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *
+  * IDENTIFICATION
+  *	  src/common/controldata_utils.c
+  *
+  *-------------------------------------------------------------------------
+  */
+ 
+ #ifndef FRONTEND
+ #include "postgres.h"
+ #else
+ #include "postgres_fe.h"
+ #endif
+ 
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+ #include "catalog/pg_control.h"
+ #include "common/controldata_utils.h"
+ #include "port/pg_crc32c.h"
+ 
+ #ifndef FRONTEND
+ /* NOTE: caller must provide gettext call around the format string */
+ #define log_error(...)	\
+ 	elog(ERROR, __VA_ARGS__)
+ #else
+ #define log_error(...)	\
+ 	do { \
+ 			char *buf = psprintf(__VA_ARGS__); \
+ 			fprintf(stderr, "%s: %s\n", progname, buf); \
+ 			exit(2); \
+ 	} while (0)
+ #endif
+ 
+ /*
+  * get_controlfile(char *DataDir, const char *progname)
+  *
+  * Get controlfile values. The caller is responsible
+  * for pfreeing the result.
+  */
+ ControlFileData *
+ get_controlfile(char *DataDir, const char *progname)
+ {
+ 	ControlFileData	   *ControlFile;
+ 	int					fd;
+ 	char				ControlFilePath[MAXPGPATH];
+ 	pg_crc32c			crc;
+ 
+ 	ControlFile = palloc(sizeof(ControlFileData));
+ 	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
+ 
+ 	if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1)
+ 		log_error(_("could not open file \"%s\" for reading: %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
+ 		log_error(_("could not read file \"%s\": %s"),
+ 				  ControlFilePath, strerror(errno));
+ 
+ 	close(fd);
+ 
+ 	/* Check the CRC. */
+ 	INIT_CRC32C(crc);
+ 	COMP_CRC32C(crc,
+ 			   (char *) ControlFile,
+ 			   offsetof(ControlFileData, crc));
+ 	FIN_CRC32C(crc);
+ 
+ 	if (!EQ_CRC32C(crc, ControlFile->crc))
+ #ifndef FRONTEND
+ 		elog(ERROR, _("calculated CRC checksum does not match value stored in file"));
+ #else
+ 		printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
+ 				 "Either the file is corrupt, or it has a different layout than this program\n"
+ 				 "is expecting.  The results below are untrustworthy.\n\n"));
+ #endif
+ 
+ 	/* Make sure the control file is valid byte order. */
+ 	if (ControlFile->pg_control_version % 65536 == 0 &&
+ 		ControlFile->pg_control_version / 65536 != 0)
+ #ifndef FRONTEND
+ 		elog(ERROR, _("byte ordering mismatch"));
+ #else
+ 		printf(_("WARNING: possible byte ordering mismatch\n"
+ 				 "The byte ordering used to store the pg_control file might not match the one\n"
+ 				 "used by this program.  In that case the results below would be incorrect, and\n"
+ 				 "the PostgreSQL installation would be incompatible with this data directory.\n"));
+ #endif
+ 
+ 	return ControlFile;
+ }
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 62b9125..e22bfd3 100644
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
*************** DESCR("row security for current context
*** 5216,5221 ****
--- 5216,5234 ----
  DATA(insert OID = 3400 ( pg_config PGNSP PGUID 12 1 23 0 0 f f f f t t i r 0 0 2249 "" "{25,25}" "{o,o}" "{name,setting}" _null_ _null_ pg_config _null_ _null_ _null_ ));
  DESCR("pg_config binary as a function");
  
+ /* pg_controldata related functions */
+ DATA(insert OID = 3441 ( pg_control_system PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,20,1184}" "{o,o,o,o}" "{pg_control_version,catalog_version_no,system_identifier,pg_control_last_modified}" _null_ _null_ pg_control_system _null_ _null_ _null_ ));
+ DESCR("pg_controldata general state information as a function");
+ 
+ DATA(insert OID = 3442 ( pg_control_checkpoint PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,3220,3220,25,23,23,16,25,26,28,28,28,26,28,28,26,28,28,1184}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{checkpoint_location,prior_location,redo_location,redo_wal_file,timeline_id,prev_timeline_id,full_page_writes,next_xid,next_oid,next_multixact_id,next_multi_offset,oldest_xid,oldest_xid_dbid,oldest_active_xid,oldest_multi_xid,oldest_multi_dbid,oldest_commit_ts_xid,newest_commit_ts_xid,checkpoint_time}" _null_ _null_ pg_control_checkpoint _null_ _null_ _null_ ));
+ DESCR("pg_controldata checkpoint state information as a function");
+ 
+ DATA(insert OID = 3443 ( pg_control_recovery PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,23,3220,3220,16}" "{o,o,o,o,o}" "{min_recovery_end_location,min_recovery_end_timeline,backup_start_location,backup_end_location,end_of_backup_record_required}" _null_ _null_ pg_control_recovery _null_ _null_ _null_ ));
+ DESCR("pg_controldata recovery state information as a function");
+ 
+ DATA(insert OID = 3444 ( pg_control_init PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,23,23,23,23,23,23,23,16,16,16,23}" "{o,o,o,o,o,o,o,o,o,o,o,o,o}" "{max_data_alignment,database_block_size,blocks_per_segment,wal_block_size,bytes_per_wal_segment,max_identifier_length,max_index_columns,max_toast_chunk_size,large_object_chunk_size,bigint_timestamps,float4_pass_by_value,float8_pass_by_value,data_page_checksum_version}" _null_ _null_ pg_control_init _null_ _null_ _null_ ));
+ DESCR("pg_controldata init state information as a function");
+ 
  /*
   * Symbolic values for provolatile column: these indicate whether the result
   * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/common/controldata_utils.h b/src/include/common/controldata_utils.h
index ...1a09765 .
*** a/src/include/common/controldata_utils.h
--- b/src/include/common/controldata_utils.h
***************
*** 0 ****
--- 1,15 ----
+ /*
+  * controldata_utils.h
+  *		Common code for pg_controldata output
+  *
+  *	Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+  *	Portions Copyright (c) 1994, Regents of the University of California
+  *
+  *	src/include/common/controldata_utils.h
+  */
+ #ifndef COMMON_CONTROLDATA_UTILS_H
+ #define COMMON_CONTROLDATA_UTILS_H
+ 
+ extern ControlFileData *get_controlfile(char *DataDir, const char *progname);
+ 
+ #endif   /* COMMON_CONTROLDATA_UTILS_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 7ec93c9..115f8af 100644
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
*************** extern Datum show_all_file_settings(PG_F
*** 1151,1156 ****
--- 1151,1162 ----
  /* pg_config.c */
  extern Datum pg_config(PG_FUNCTION_ARGS);
  
+ /* pg_controldata.c */
+ extern Datum pg_control_checkpoint(PG_FUNCTION_ARGS);
+ extern Datum pg_control_system(PG_FUNCTION_ARGS);
+ extern Datum pg_control_init(PG_FUNCTION_ARGS);
+ extern Datum pg_control_recovery(PG_FUNCTION_ARGS);
+ 
  /* rls.c */
  extern Datum row_security_active(PG_FUNCTION_ARGS);
  extern Datum row_security_active_name(PG_FUNCTION_ARGS);
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index e4fb44e..949077a 100644
*** a/src/tools/msvc/Mkvcbuild.pm
--- b/src/tools/msvc/Mkvcbuild.pm
*************** sub mkvcbuild
*** 106,113 ****
  	}
  
  	our @pgcommonallfiles = qw(
! 	  config_info.c exec.c pg_lzcompress.c pgfnames.c psprintf.c
! 	  relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c
--- 106,113 ----
  	}
  
  	our @pgcommonallfiles = qw(
! 	  config_info.c controldata_utils.c exec.c pg_lzcompress.c pgfnames.c
! 	  psprintf.c relpath.c rmtree.c string.c username.c wait_error.c);
  
  	our @pgcommonfrontendfiles = (
  		@pgcommonallfiles, qw(fe_memutils.c