Merge branch 'PGPRO9_5' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_5

PopovValery · PopovValery · commit 436f65470b62 · 2016-03-29T11:43:19.000+03:00
diff --git a/configure b/configure
@@ -2676,7 +2676,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-PACKAGE_TARNAME=postgrespro
+
 
 
 
diff --git a/configure.in b/configure.in
@@ -18,7 +18,7 @@ dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
 AC_INIT([PostgreSQL], [9.5.2], [bugs@postgrespro.ru],[postgrespro])
-PACKAGE_TARNAME=postgrespro
+
 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
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
@@ -395,7 +395,8 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
   </para>
 
   <para>
-   Currently, only the B-tree, GiST and GIN index types support multicolumn
+   Currently, only the B-tree, GiST, GIN, and BRIN
+   index types support multicolumn
    indexes.  Up to 32 columns can be specified.  (This limit can be
    altered when building <productname>&productname;</productname>; see the
    file <filename>pg_config_manual.h</filename>.)
@@ -440,6 +441,15 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
    the query conditions use.
   </para>
 
+  <para>
+   A multicolumn BRIN index can be used with query conditions that
+   involve any subset of the index's columns. Like GIN and unlike B-tree or
+   GiST, index search effectiveness is the same regardless of which index
+   column(s) the query conditions use. The only reason to have multiple BRIN
+   indexes instead of one multicolumn BRIN index on a single table is to have
+   a different <literal>pages_per_range</literal> storage parameter.
+  </para>
+
   <para>
    Of course, each column must be used with operators appropriate to the index
    type; clauses that involve other operators will not be considered.
diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,5,1,0
- PRODUCTVERSION 9,5,1,0
+ FILEVERSION 9,5,2,0
+ PRODUCTVERSION 9,5,2,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "9.5.1\0"
+            VALUE "FileVersion", "9.5.2\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2015\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "9.5.1\0"
+            VALUE "ProductVersion", "9.5.2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
 #include "pg_config.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    9,5,1,0
- PRODUCTVERSION 9,5,1,0
+ FILEVERSION    9,5,2,0
+ PRODUCTVERSION 9,5,2,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32

Original file line number	Diff line number	Diff line change
`@@ -2676,7 +2676,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $`
`2676`	`2676`	`ac_compiler_gnu=$ac_cv_c_compiler_gnu`
`2677`	`2677`
`2678`	`2678`
`2679`		`-PACKAGE_TARNAME=postgrespro`
	`2679`	`+`
`2680`	`2680`
`2681`	`2681`
`2682`	`2682`