Commit5445434

committed

Merge branch 'REL9_5_STABLE' into PGPRO9_5

2 parents7c8d062 +47215c1 commit5445434Copy full SHA for 5445434

File tree

+183

-130

lines changed

+183

-130

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>`
`29`	`29`	`[ LC_CTYPE [=] <replaceable class="parameter">lc_ctype</replaceable> ]`
`30`	`30`	`[ TABLESPACE [=] <replaceable class="parameter">tablespace_name</replaceable> ]`
`31`	`31`	`[ ALLOW_CONNECTIONS [=] <replaceable class="parameter">allowconn</replaceable> ]`
`32`		`- [ CONNECTION LIMIT [=] <replaceable class="parameter">connlimit</replaceable> ] ]`
`33`		`- [ IS_TEMPLATE [=] <replaceable class="parameter">istemplate</replaceable> ]`
	`32`	`+ [ CONNECTION LIMIT [=] <replaceable class="parameter">connlimit</replaceable> ]`
	`33`	`+ [ IS_TEMPLATE [=] <replaceable class="parameter">istemplate</replaceable> ] ]`
`34`	`34`	`</synopsis>`
`35`	`35`	`</refsynopsisdiv>`
`36`	`36`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,8 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,`
`179`	`179`
`180`	`180`	`START_CRIT_SECTION();`
`181`	`181`	`PageIndexDeleteNoCompact(oldpage,&oldoff,1);`
`182`		`-if (PageAddItem(oldpage, (Item)newtup,newsz,oldoff, true,`
`183`		`-false)==InvalidOffsetNumber)`
	`182`	`+if (PageAddItemExtended(oldpage, (Item)newtup,newsz,oldoff,`
	`183`	`+PAI_OVERWRITE \|PAI_ALLOW_FAR_OFFSET)==InvalidOffsetNumber)`
`184`	`184`	`elog(ERROR,"failed to add BRIN tuple");`
`185`	`185`	`MarkBufferDirty(oldbuf);`
`186`	`186`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,10 @@ brinGetTupleForHeapBlock(BrinRevmap *revmap, BlockNumber heapBlk,`
`266`	`266`	`/* If we land on a revmap page, start over */`
`267`	`267`	`if (BRIN_IS_REGULAR_PAGE(page))`
`268`	`268`	`{`
	`269`	`+if (*off>PageGetMaxOffsetNumber(page))`
	`270`	`+ereport(ERROR,`
	`271`	`+(errcode(ERRCODE_INDEX_CORRUPTED),`
	`272`	`+errmsg_internal("corrupted BRIN index: inconsistent range map")));`
`269`	`273`	`lp=PageGetItemId(page,*off);`
`270`	`274`	`if (ItemIdIsUsed(lp))`
`271`	`275`	`{`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,8 @@ brin_xlog_samepage_update(XLogReaderState *record)`
`193`	`193`	`elog(PANIC,"brin_xlog_samepage_update: invalid max offset number");`
`194`	`194`
`195`	`195`	`PageIndexDeleteNoCompact(page,&offnum,1);`
`196`		`-offnum=PageAddItem(page, (Item)brintuple,tuplen,offnum, true, false);`
	`196`	`+offnum=PageAddItemExtended(page, (Item)brintuple,tuplen,offnum,`
	`197`	`+PAI_OVERWRITE \|PAI_ALLOW_FAR_OFFSET);`
`197`	`198`	`if (offnum==InvalidOffsetNumber)`
`198`	`199`	`elog(PANIC,"brin_xlog_samepage_update: failed to add tuple");`
`199`	`200`

Comments

(0)