Merge branch 'PGPROEE10' into PGPROEE10_MULTIMASTER

Author: kelvich

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PostgreSQL 10.1.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 10.3.
 #
 # Report bugs to <bugs@postgrespro.ru>.
 #
@@ -11,8 +11,8 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (c) 1996-2017, PostgreSQL Global Development Group
-# Copyright (c) 2015-2017, Postgres Professional
+# Copyright (c) 1996-2018, PostgreSQL Global Development Group
+# Copyright (c) 2015-2018, Postgres Professional
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -583,8 +583,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgrespro'
-PACKAGE_VERSION='10.1'
-PACKAGE_STRING='PostgreSQL 10.1'
+PACKAGE_VERSION='10.3'
+PACKAGE_STRING='PostgreSQL 10.3'
 PACKAGE_BUGREPORT='bugs@postgrespro.ru'
 PACKAGE_URL=''
 
@@ -627,6 +627,7 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+PROJECT_NAME
 PRODUCT_NAME
 PGPRO_VERSION
 vpath_build
@@ -763,6 +764,7 @@ build_os
 build_vendor
 build_cpu
 build
+PGPRO_EDN
 PGPRO_EDITION
 PGPRO_PACKAGE_NAME
 PG_MAJORVERSION
@@ -1429,7 +1431,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 10.1 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 10.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1495,7 +1497,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 10.1:";;
+     short | recursive ) echo "Configuration of PostgreSQL 10.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1656,15 +1658,15 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 10.1
+PostgreSQL configure 10.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (c) 1996-2017, PostgreSQL Global Development Group
-Copyright (c) 2015-2017, Postgres Professional
+Copyright (c) 1996-2018, PostgreSQL Global Development Group
+Copyright (c) 2015-2018, Postgres Professional
 _ACEOF
   exit
 fi
@@ -2368,7 +2370,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 10.1, which was
+It was created by PostgreSQL $as_me 10.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2785,10 +2787,14 @@ else
 fi
 
 
+
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
+PGPRO_EDN="ent"
 PRODUCT_NAME="Postgres Pro Enterprise"
+PROJECT_NAME="Postgres Pro"
+
 
 
 
@@ -2807,6 +2813,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define PGPRO_EDN "$PGPRO_EDN"
+_ACEOF
+
+
 cat >>confdefs.h <<_ACEOF
 #define PGPRO_VERSION "$PGPRO_VERSION"
 _ACEOF
@@ -17187,6 +17198,8 @@ fi
 
 
 
+
+
 ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
 
 
@@ -17714,7 +17727,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 10.1, which was
+This file was extended by PostgreSQL $as_me 10.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17784,7 +17797,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PostgreSQL config.status 10.1
+PostgreSQL config.status 10.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.in

@@ -17,15 +17,15 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [10.1], [bugs@postgrespro.ru], [postgrespro])
+AC_INIT([PostgreSQL], [10.3], [bugs@postgrespro.ru], [postgrespro])
 PACKAGE_TARNAME=postgrespro-enterprise
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
 recommended.  You can remove the check from 'configure.in' but it is then
 your responsibility whether the result works or not.])])
-AC_COPYRIGHT([Copyright (c) 1996-2017, PostgreSQL Global Development Group
-Copyright (c) 2015-2017, Postgres Professional])
+AC_COPYRIGHT([Copyright (c) 1996-2018, PostgreSQL Global Development Group
+Copyright (c) 2015-2018, Postgres Professional])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
 AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -38,15 +38,20 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
 PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION$withval"],
              [PG_VERSION="$PACKAGE_VERSION"])
+
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
+PGPRO_EDN="ent"
 PRODUCT_NAME="Postgres Pro Enterprise"
+PROJECT_NAME="Postgres Pro"
 AC_SUBST(PGPRO_PACKAGE_NAME)
 AC_SUBST(PGPRO_EDITION)
+AC_SUBST(PGPRO_EDN)
 AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
 AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro     name as a string])            
 AC_DEFINE_UNQUOTED(PGPRO_EDITION,"$PGPRO_EDITION",[PostgresPro edition])
+AC_DEFINE_UNQUOTED(PGPRO_EDN,"$PGPRO_EDN",[PostgresPro edition abbreviated])
 AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro
 version as a  string])
 
@@ -2277,6 +2282,8 @@ AC_SUBST(PGPRO_VERSION)
 
 AC_SUBST(PRODUCT_NAME)
 
+AC_SUBST(PROJECT_NAME)
+
 AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
 
 AC_CONFIG_LINKS([

contrib/auto_explain/auto_explain.c

@@ -78,7 +78,7 @@ _PG_init(void)
 							"Zero prints all plans. -1 turns this feature off.",
 							&auto_explain_log_min_duration,
 							-1,
-							-1, INT_MAX / 1000,
+							-1, INT_MAX,
 							PGC_SUSET,
 							GUC_UNIT_MS,
 							NULL,

contrib/dump_stat/.gitignore

@@ -1,2 +1,5 @@
-/results/
-/tmp_check/
+log/
+results/
+tmp_check/
+regression*
+dump_stat--?.?.sql

contrib/dump_stat/Makefile

@@ -4,9 +4,15 @@ MODULE_big	= dump_stat
 OBJS		= anyarray_elemtype.o $(WIN32RES)
 
 EXTENSION = dump_stat
-DATA = dump_stat--1.0.sql
+EXTVERSION = 1.1
 PGFILEDESC = "dump_stat - move pg_statistic to new instance of PostgreSQL"
 
+
+DATA = dump_stat--1.0.sql dump_stat--1.0--1.1.sql
+DATA_built = dump_stat--$(EXTVERSION).sql
+
+REGRESS = dump_stat
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -18,7 +24,12 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+dump_stat--$(EXTVERSION).sql: $(DATA)
+	cat $^ > $@
+
 temp-install: EXTRA_INSTALL=contrib/dump_stat
 
-check: temp-install
+check-tap: temp-install
 	$(prove_check)
+
+check: check-tap