Commite1d003b

committed

Merge branch 'master' of git.postgrespro.ru:pgpro-dev/pg_probackup

2 parents5e0e881 +29d529a commite1d003bCopy full SHA for e1d003b

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -551,11 +551,11 @@ parse_backup_mode(const char *value)`
`551`	`551`	`v++;`
`552`	`552`	`len=strlen(v);`
`553`	`553`
`554`		`-if (len>0&&pg_strncasecmp("full",v,strlen("full"))==0)`
	`554`	`+if (len>0&&pg_strncasecmp("full",v,len)==0)`
`555`	`555`	`returnBACKUP_MODE_FULL;`
`556`		`-elseif (len>0&&pg_strncasecmp("page",v,strlen("page"))==0)`
	`556`	`+elseif (len>0&&pg_strncasecmp("page",v,len)==0)`
`557`	`557`	`returnBACKUP_MODE_DIFF_PAGE;`
`558`		`-elseif (len>0&&pg_strncasecmp("ptrack",v,strlen("ptrack"))==0)`
	`558`	`+elseif (len>0&&pg_strncasecmp("ptrack",v,len)==0)`
`559`	`559`	`returnBACKUP_MODE_DIFF_PTRACK;`
`560`	`560`
`561`	`561`	`/* Backup mode is invalid, so leave with an error */`
`@@ -609,4 +609,4 @@ pgBackupGetPath(const pgBackup backup, char path, size_t len, const char *subd`
`609`	`609`	`free(datetime);`
`610`	`610`
`611`	`611`	`make_native_path(path);`
`612`		`-}`
	`612`	`+}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@ backup_data_page(pgFile file, const XLogRecPtr prev_backup_start_lsn,`
`78`	`78`	`/* TODO Should we check specific error code here? */`
`79`	`79`	`if (verbose)`
`80`	`80`	`elog(WARNING,"File: %s, could not seek to block %u."`
`81`		`-"Probably the file was truncated after backup start.",`
`82`		`-file->path,blknum);`
`83`		`-return;`
	`81`	`+"Probably the file was truncated after backup start.",`
	`82`	`+file->path,blknum);`
	`83`	`+return;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`read_len=fread(&page,1,BLCKSZ,in);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ do_restore_or_validate(time_t target_backup_id,`
`215`	`215`	`{`
`216`	`216`	`pgBackupbackup= (pgBackup)parray_get(backups,i);`
`217`	`217`
`218`		`-if (backup->status==BACKUP_STATUS_OK);`
	`218`	`+if (backup->status==BACKUP_STATUS_OK)`
`219`	`219`	`{`
`220`	`220`	`pgBackupValidate(backup);`
`221`	`221`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ show_backup_list(FILE out, parray backup_list)`
`195`	`195`	`/* Get parent timeline before printing */`
`196`	`196`	`parent_tli=get_parent_tli(backup->tli);`
`197`	`197`
`198`		`-fprintf(out,"%-8s %-19s %s%s %2d / %-2d %5s %6s %2X/%08X %2X/%08X %-8s\n",`
	`198`	`+fprintf(out,"%-8s %-19s %s%-9s %2d / %d %5s %6s %2X/%08X %2X/%08X %-8s\n",`
`199`	`199`	`base36enc(backup->start_time),`
`200`	`200`	`timestamp,`
`201`	`201`	`backupModes[backup->backup_mode],`

Comments

(0)