Commit436f654

committed

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

2 parents75b77bb +9e6b222 commit436f654Copy full SHA for 436f654

File tree

+19

-9

lines changed

+19

-9

lines changed

Lines changed: 1 addition & 1 deletion

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`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dnl`
`18`	`18`	`m4_pattern_forbid(^PGAC_)dnl to catch undefined macros`
`19`	`19`
`20`	`20`	`AC_INIT([PostgreSQL], [9.5.2], [bugs@postgrespro.ru],[postgrespro])`
`21`		`-PACKAGE_TARNAME=postgrespro`
	`21`	`+`
`22`	`22`	`m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.`
`23`	`23`	`Untested combinations of 'autoconf' and PostgreSQL versions are not`
`24`	`24`	`recommended. You can remove the check from 'configure.in' but it is then`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,8 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);`
`395`	`395`	`</para>`
`396`	`396`
`397`	`397`	`<para>`
`398`		`- Currently, only the B-tree, GiST and GIN index types support multicolumn`
	`398`	`+ Currently, only the B-tree, GiST, GIN, and BRIN`
	`399`	`+ index types support multicolumn`
`399`	`400`	`indexes. Up to 32 columns can be specified. (This limit can be`
`400`	`401`	`altered when building <productname>&productname;</productname>; see the`
`401`	`402`	`file <filename>pg_config_manual.h</filename>.)`
`@@ -440,6 +441,15 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);`
`440`	`441`	`the query conditions use.`
`441`	`442`	`</para>`
`442`	`443`
	`444`	`+ <para>`
	`445`	`+ A multicolumn BRIN index can be used with query conditions that`
	`446`	`+ involve any subset of the index's columns. Like GIN and unlike B-tree or`
	`447`	`+ GiST, index search effectiveness is the same regardless of which index`
	`448`	`+ column(s) the query conditions use. The only reason to have multiple BRIN`
	`449`	`+ indexes instead of one multicolumn BRIN index on a single table is to have`
	`450`	`+ a different <literal>pages_per_range</literal> storage parameter.`
	`451`	`+ </para>`
	`452`	`+`
`443`	`453`	`<para>`
`444`	`454`	`Of course, each column must be used with operators appropriate to the index`
`445`	`455`	`type; clauses that involve other operators will not be considered.`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`#include <winver.h>`
`2`	`2`
`3`	`3`	`VS_VERSION_INFO VERSIONINFO`
`4`		`- FILEVERSION 9,5,1,0`
`5`		`- PRODUCTVERSION 9,5,1,0`
	`4`	`+ FILEVERSION 9,5,2,0`
	`5`	`+ PRODUCTVERSION 9,5,2,0`
`6`	`6`	`FILEFLAGSMASK 0x3fL`
`7`	`7`	`FILEFLAGS 0`
`8`	`8`	`FILEOS VOS__WINDOWS32`
`@@ -15,13 +15,13 @@ BEGIN`
`15`	`15`	`BEGIN`
`16`	`16`	`VALUE "CompanyName", "\0"`
`17`	`17`	`VALUE "FileDescription", "PostgreSQL Access Library\0"`
`18`		`- VALUE "FileVersion", "9.5.1\0"`
	`18`	`+ VALUE "FileVersion", "9.5.2\0"`
`19`	`19`	`VALUE "InternalName", "libpq\0"`
`20`	`20`	`VALUE "LegalCopyright", "Copyright (C) 2015\0"`
`21`	`21`	`VALUE "LegalTrademarks", "\0"`
`22`	`22`	`VALUE "OriginalFilename", "libpq.dll\0"`
`23`	`23`	`VALUE "ProductName", "PostgreSQL\0"`
`24`		`- VALUE "ProductVersion", "9.5.1\0"`
	`24`	`+ VALUE "ProductVersion", "9.5.2\0"`
`25`	`25`	`END`
`26`	`26`	`END`
`27`	`27`	`BLOCK "VarFileInfo"`

Lines changed: 2 additions & 2 deletions

Comments

(0)