Merge branch 'PGPROEE9_6' into PGPROEE9_6_aqo

To import fixes for pg_hint_plan tests.

Author: vbwagner

.ci/make_test_base

@@ -9,12 +9,12 @@ On success, starts database
 """
 import os,sys,subprocess,glob,re,os.path,time
 
-datadir=sys.argv[1]
-
-if not datadir:
-    print >>sys.stderr,"Usage %s directory"%sys.argv[0]
+if len(sys.argv)!=2:
+    print >>sys.stderr,"Usage %s data-directory" % sys.argv[0]
     sys.exit(1)
 
+datadir=sys.argv[1]
+
 if os.access(datadir,os.R_OK):
     import shutil
     shutil.rmtree(datadir)

.ci/run_install_check

@@ -2,6 +2,19 @@
 # Makes temporary installation and runs installcheck-world on it
 # Should be run as non-privileged user.
 # Exit on all errors
+# If run without arguments, makes installcheck-world
+# Otherwise first argument is interpreted as subdirectory 
+# to change before runnning make installchedk
+# i.e
+#    run_install_check . 
+# test core only
+#    run_install_check contrib
+# tests contrib only
+# etc.
+# All other arguments are passed to Makefile intact
+# To make possible pass arguments to installcheck-world
+#    run_install_check world
+# does the same as no args
 set -e
 # Install
 make install prefix=`pwd`/tmp_install
@@ -19,7 +32,13 @@ export PGPORT
 ./.ci/make_test_base $PGDATA
 #run checks
 set +e
+if [  -z "$1" -o "$1" = "world" ]; then
 make installcheck-world  prefix=`pwd`/tmp_install NO_LOCALE=1
+else
+dir=$1
+shift
+make -C "$dir" installcheck prefix=`pwd`/tmp_install NO_LOCALE=1 ${@:+"$@"}
+fi
 code=$?
 pg_ctl stop -D $PGDATA
 exit $code

COPYRIGHT

@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
 (formerly known as Postgres, then as Postgres95)
 
-Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 

configure

@@ -2754,7 +2754,7 @@ else
 fi
 
 
-PGPRO_VERSION="$PACKAGE_VERSION.2"
+PGPRO_VERSION="$PACKAGE_VERSION.3"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 
@@ -9898,6 +9898,62 @@ done
 fi
 
 if test "$with_icu" = yes ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
+$as_echo_n "checking for library containing ucol_open_58... " >&6; }
+if ${ac_cv_search_ucol_open_58+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ucol_open_58 ();
+int
+main ()
+{
+return ucol_open_58 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' icui18n icuin; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_ucol_open_58=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_ucol_open_58+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_ucol_open_58+:} false; then :
+
+else
+  ac_cv_search_ucol_open_58=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
+$as_echo "$ac_cv_search_ucol_open_58" >&6; }
+ac_res=$ac_cv_search_ucol_open_58
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_57" >&5
 $as_echo_n "checking for library containing ucol_open_57... " >&6; }
 if ${ac_cv_search_ucol_open_57+:} false; then :
@@ -10900,6 +10956,54 @@ fi
 
 fi
 
+
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
+$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
+if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-licuuc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ucnv_fromUChars_58 ();
+int
+main ()
+{
+return ucnv_fromUChars_58 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
+else
+  ac_cv_lib_icuuc_ucnv_fromUChars_58=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
+$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
+if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBICUUC 1
+_ACEOF
+
+  LIBS="-licuuc $LIBS"
+
+else
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
 $as_echo_n "checking for ucnv_fromUChars_57 in -licuuc... " >&6; }
 if ${ac_cv_lib_icuuc_ucnv_fromUChars_57+:} false; then :
@@ -11713,6 +11817,9 @@ fi
 fi
 
 
+fi
+
+
 fi
 
 fi

configure.in

@@ -38,7 +38,7 @@ 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.2"
+PGPRO_VERSION="$PACKAGE_VERSION.3"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 AC_SUBST(PGPRO_PACKAGE_NAME)
@@ -1162,6 +1162,7 @@ if test "$with_openssl" = yes ; then
 fi
 
 if test "$with_icu" = yes ; then
+ AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1195,6 +1196,8 @@ if test "$with_icu" = yes ; then
  ])
  ])
  ])
+])
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1228,6 +1231,7 @@ if test "$with_icu" = yes ; then
  ])
  ])
  ])
+])
 fi
 
 if test "$with_pam" = yes ; then