Commit1607369

Artur Zakirov

committed

Use recovery_target_timeline in recovery.conf only with --timeline option

1 parenta40f1f5 commit1607369Copy full SHA for 1607369

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ do_restore(time_t backup_id,`
`215`	`215`	`dest_backup= (pgBackup*)parray_get(backups,last_diff_index);`
`216`	`216`	`if (!dest_backup->stream\|\| (target_time!=NULL\|\|target_xid!=NULL))`
`217`	`217`	`create_recovery_conf(backup_id,target_time,target_xid,`
`218`		`-target_inclusive,base_backup->tli);`
	`218`	`+target_inclusive,target_tli);`
`219`	`219`
`220`	`220`	`/* cleanup */`
`221`	`221`	`parray_walk(backups,pgBackupFree);`
`@@ -676,7 +676,8 @@ create_recovery_conf(time_t backup_id,`
`676`	`676`	`if (target_inclusive)`
`677`	`677`	`fprintf(fp,"recovery_target_inclusive = '%s'\n",target_inclusive);`
`678`	`678`
`679`		`-fprintf(fp,"recovery_target_timeline = '%u'\n",target_tli);`
	`679`	`+if (target_tli)`
	`680`	`+fprintf(fp,"recovery_target_timeline = '%u'\n",target_tli);`
`680`	`681`
`681`	`682`	`fclose(fp);`
`682`	`683`	`}`

Comments

(0)