Merge tag 'REL9_5_4' into waits_monitoring_95

Author: Alexander Korotkov

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PostgreSQL 9.5.3.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 9.5.4.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='9.5.3'
-PACKAGE_STRING='PostgreSQL 9.5.3'
+PACKAGE_VERSION='9.5.4'
+PACKAGE_STRING='PostgreSQL 9.5.4'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 PACKAGE_URL=''
 
@@ -1395,7 +1395,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 9.5.3 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.5.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1460,7 +1460,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 9.5.3:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.5.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1610,7 +1610,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 9.5.3
+PostgreSQL configure 9.5.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2321,7 +2321,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 9.5.3, which was
+It was created by PostgreSQL $as_me 9.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -16195,7 +16195,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 9.5.3, which was
+This file was extended by PostgreSQL $as_me 9.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16265,7 +16265,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 9.5.3
+PostgreSQL config.status 9.5.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.in

@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [9.5.3], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [9.5.4], [pgsql-bugs@postgresql.org])
 
 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

contrib/btree_gin/btree_gin.c

@@ -223,10 +223,7 @@ GIN_SUPPORT(int4, false, leftmostvalue_int4, btint4cmp)
 static Datum
 leftmostvalue_int8(void)
 {
-	/*
-	 * Use sequence's definition to keep compatibility.
-	 */
-	return Int64GetDatum(SEQ_MINVALUE);
+	return Int64GetDatum(PG_INT64_MIN);
 }
 
 GIN_SUPPORT(int8, false, leftmostvalue_int8, btint8cmp)
@@ -250,10 +247,7 @@ GIN_SUPPORT(float8, false, leftmostvalue_float8, btfloat8cmp)
 static Datum
 leftmostvalue_money(void)
 {
-	/*
-	 * Use sequence's definition to keep compatibility.
-	 */
-	return Int64GetDatum(SEQ_MINVALUE);
+	return Int64GetDatum(PG_INT64_MIN);
 }
 
 GIN_SUPPORT(money, false, leftmostvalue_money, cash_cmp)

contrib/btree_gin/expected/bytea.out

@@ -4,21 +4,21 @@ SET bytea_output TO escape;
 CREATE TABLE test_bytea (
 	i bytea
 );
-INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_bytea ON test_bytea USING gin (i);
 SELECT * FROM test_bytea WHERE i<'abc'::bytea ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
 SELECT * FROM test_bytea WHERE i<='abc'::bytea ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)

contrib/btree_gin/expected/text.out

@@ -2,21 +2,21 @@ set enable_seqscan=off;
 CREATE TABLE test_text (
 	i text
 );
-INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_text ON test_text USING gin (i);
 SELECT * FROM test_text WHERE i<'abc' ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
 SELECT * FROM test_text WHERE i<='abc' ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)

contrib/btree_gin/expected/varchar.out

@@ -2,21 +2,21 @@ set enable_seqscan=off;
 CREATE TABLE test_varchar (
 	i varchar
 );
-INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_varchar ON test_varchar USING gin (i);
 SELECT * FROM test_varchar WHERE i<'abc'::varchar ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
 SELECT * FROM test_varchar WHERE i<='abc'::varchar ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)

contrib/btree_gin/sql/bytea.sql

@@ -6,7 +6,7 @@ CREATE TABLE test_bytea (
 	i bytea
 );
 
-INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_bytea ON test_bytea USING gin (i);
 

contrib/btree_gin/sql/text.sql

@@ -4,7 +4,7 @@ CREATE TABLE test_text (
 	i text
 );
 
-INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_text ON test_text USING gin (i);
 

contrib/btree_gin/sql/varchar.sql

@@ -4,7 +4,7 @@ CREATE TABLE test_varchar (
 	i varchar
 );
 
-INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_varchar ON test_varchar USING gin (i);
 

contrib/btree_gist/expected/interval.out

@@ -89,3 +89,21 @@ SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21
  @ 220 days 19 hours 5 mins 42 secs  | @ 21 days -2 hours -15 mins -41 secs
 (3 rows)
 
+SET enable_indexonlyscan=off;
+EXPLAIN (COSTS OFF)
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Limit
+   ->  Index Scan using intervalidx on intervaltmp
+         Order By: (a <-> '@ 199 days 21 hours 21 mins 23 secs'::interval)
+(3 rows)
+
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+                  a                  |               ?column?               
+-------------------------------------+--------------------------------------
+ @ 199 days 21 hours 21 mins 23 secs | @ 0
+ @ 183 days 6 hours 52 mins 48 secs  | @ 16 days 14 hours 28 mins 35 secs
+ @ 220 days 19 hours 5 mins 42 secs  | @ 21 days -2 hours -15 mins -41 secs
+(3 rows)
+

contrib/btree_gist/expected/not_equal.out

@@ -9,6 +9,7 @@ INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
 INSERT INTO test_ne VALUES('2007-02-03', -91.3);
 INSERT INTO test_ne VALUES('2011-09-01', 43.7);
 INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
+SET enable_indexscan to false;
 EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
                                               QUERY PLAN                                              
 ------------------------------------------------------------------------------------------------------
@@ -25,6 +26,7 @@ SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
  Thu Sep 01 00:00:00 2011 |  43.7
 (2 rows)
 
+RESET enable_indexscan;
 -- test search for "not equals" using an exclusion constraint
 CREATE TABLE zoo (
    cage   INTEGER,

contrib/btree_gist/sql/interval.sql

@@ -35,3 +35,9 @@ SELECT count(*) FROM intervaltmp WHERE a >  '199 days 21:21:23'::interval;
 EXPLAIN (COSTS OFF)
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+
+SET enable_indexonlyscan=off;
+
+EXPLAIN (COSTS OFF)
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;

contrib/btree_gist/sql/not_equal.sql

@@ -14,10 +14,14 @@ INSERT INTO test_ne VALUES('2007-02-03', -91.3);
 INSERT INTO test_ne VALUES('2011-09-01', 43.7);
 INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
 
+SET enable_indexscan to false;
+
 EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
 
 SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
 
+RESET enable_indexscan;
+
 -- test search for "not equals" using an exclusion constraint
 
 CREATE TABLE zoo (