Commitc069399

committed

Merge branch 'master' into issue_92

2 parents500e8b9 +eb2a397 commitc069399Copy full SHA for c069399

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ prepare_page(ConnectionArgs *arguments,`
`356`	`356`	`((strict&& !is_ptrack_support)\|\| !strict))`
`357`	`357`	`{`
`358`	`358`	`/* show this message for checkdb or backup without ptrack support */`
`359`		`-elog(WARNING,"CORRUPTIONin file%s, block %u",`
	`359`	`+elog(WARNING,"Corruption detectedin file\"%s\", block %u",`
`360`	`360`	`file->path,blknum);`
`361`	`361`	`}`
`362`	`362`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,12 @@ def test_backup_detect_corruption(self):`
`470`	`470`	`repr(self.output),self.cmd))`
`471`	`471`	`exceptProbackupExceptionase:`
`472`	`472`	`self.assertIn(`
`473`		`-'Insert correct message',`
	`473`	`+'WARNING: Corruption detected in file',`
	`474`	`+e.message,`
	`475`	`+'\n Unexpected Error Message: {0}\n CMD: {1}'.format(`
	`476`	`+repr(e.message),self.cmd))`
	`477`	`+self.assertIn(`
	`478`	`+'ERROR: Data file corruption',`
`474`	`479`	`e.message,`
`475`	`480`	`'\n Unexpected Error Message: {0}\n CMD: {1}'.format(`
`476`	`481`	`repr(e.message),self.cmd))`

Comments

(0)