Commitaed1a01

committed

Fix longstanding gripe that we check for 0000000001.history at start of

archive recovery, even when we know it is never present.

1 parent9507c8a commitaed1a01Copy full SHA for aed1a01

File tree

-1

lines changed

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.360 2010/01/23 16:37:12 sriggs Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.361 2010/01/26 00:07:13 sriggs Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -4142,6 +4142,10 @@ readTimeLineHistory(TimeLineID targetTLI)`
`4142`	`4142`	`charfline[MAXPGPATH];`
`4143`	`4143`	`FILE*fd;`
`4144`	`4144`
	`4145`	`+/* Timeline 1 does not have a history file, so no need to check */`
	`4146`	`+if (targetTLI==1)`
	`4147`	`+returnlist_make1_int((int)targetTLI);`
	`4148`	`+`
`4145`	`4149`	`if (InArchiveRecovery)`
`4146`	`4150`	`{`
`4147`	`4151`	`TLHistoryFileName(histfname,targetTLI);`
`@@ -4227,6 +4231,10 @@ existsTimeLineHistory(TimeLineID probeTLI)`
`4227`	`4231`	`charhistfname[MAXFNAMELEN];`
`4228`	`4232`	`FILE*fd;`
`4229`	`4233`
	`4234`	`+/* Timeline 1 does not have a history file, so no need to check */`
	`4235`	`+if (probeTLI==1)`
	`4236`	`+return false;`
	`4237`	`+`
`4230`	`4238`	`if (InArchiveRecovery)`
`4231`	`4239`	`{`
`4232`	`4240`	`TLHistoryFileName(histfname,probeTLI);`

Comments

(0)