Merge branch 'PGPRO9_6' into PGPROEE9_6

vbwagner · vbwagner · commit 308f763e01e2 · 2016-12-01T14:19:37.000+03:00
diff --git a/contrib/pg_probackup/restore.c b/contrib/pg_probackup/restore.c
@@ -143,6 +143,8 @@ do_restore(time_t backup_id,
 			satisfy_recovery_target(base_backup, rt) &&
 			(backup_id_found || backup_id == 0))
 			goto base_backup_found;
+		else
+			backup_id_found = false;
 	}
 	/* no full backup found, cannot restore */
 	elog(ERROR, "no full backup found, cannot restore.");

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,8 @@ do_restore(time_t backup_id,`
`143`	`143`	`satisfy_recovery_target(base_backup, rt) &&`
`144`	`144`	`(backup_id_found \|\| backup_id == 0))`
`145`	`145`	`goto base_backup_found;`
	`146`	`+ else`
	`147`	`+ backup_id_found = false;`
`146`	`148`	`}`
`147`	`149`	`/* no full backup found, cannot restore */`
`148`	`150`	`elog(ERROR, "no full backup found, cannot restore.");`