Commit1e6de94

committed

Change xlog to WAL in some error messages

1 parentaeed17d commit1e6de94Copy full SHA for 1e6de94

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1259,21 +1259,21 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char *buf, int len)`
`1259`	`1259`	`ereport(ERROR,`
`1260`	`1260`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`1261`	`1261`	`errmsg("out of memory"),`
`1262`		`-errdetail("Failed while allocatingan XLog reading processor.")));`
	`1262`	`+errdetail("Failed while allocatinga WAL reading processor.")));`
`1263`	`1263`
`1264`	`1264`	`record=XLogReadRecord(xlogreader,lsn,&errormsg);`
`1265`	`1265`	`if (record==NULL)`
`1266`	`1266`	`ereport(ERROR,`
`1267`	`1267`	`(errcode_for_file_access(),`
`1268`		`-errmsg("could not read two-phase state fromxlog at %X/%X",`
	`1268`	`+errmsg("could not read two-phase state fromWAL at %X/%X",`
`1269`	`1269`	`(uint32) (lsn >>32),`
`1270`	`1270`	`(uint32)lsn)));`
`1271`	`1271`
`1272`	`1272`	`if (XLogRecGetRmid(xlogreader)!=RM_XACT_ID\|\|`
`1273`	`1273`	`(XLogRecGetInfo(xlogreader)&XLOG_XACT_OPMASK)!=XLOG_XACT_PREPARE)`
`1274`	`1274`	`ereport(ERROR,`
`1275`	`1275`	`(errcode_for_file_access(),`
`1276`		`-errmsg("expected two-phase state data is not present inxlog at %X/%X",`
	`1276`	`+errmsg("expected two-phase state data is not present inWAL at %X/%X",`
`1277`	`1277`	`(uint32) (lsn >>32),`
`1278`	`1278`	`(uint32)lsn)));`
`1279`	`1279`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6315,7 +6315,7 @@ StartupXLOG(void)`
`6315`	`6315`	`ereport(ERROR,`
`6316`	`6316`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`6317`	`6317`	`errmsg("out of memory"),`
`6318`		`-errdetail("Failed while allocatingan XLog reading processor.")));`
	`6318`	`+errdetail("Failed while allocatinga WAL reading processor.")));`
`6319`	`6319`	`xlogreader->system_identifier=ControlFile->system_identifier;`
`6320`	`6320`
`6321`	`6321`	`/*`
`@@ -11246,8 +11246,8 @@ rm_redo_error_callback(void *arg)`
`11246`	`11246`	`initStringInfo(&buf);`
`11247`	`11247`	`xlog_outdesc(&buf,record);`
`11248`	`11248`
`11249`		`-/* translator: %s isan XLog record description */`
`11250`		`-errcontext("xlog redo at %X/%X for %s",`
	`11249`	`+/* translator: %s isa WAL record description */`
	`11250`	`+errcontext("WAL redo at %X/%X for %s",`
`11251`	`11251`	`(uint32) (record->ReadRecPtr >>32),`
`11252`	`11252`	`(uint32)record->ReadRecPtr,`
`11253`	`11253`	`buf.data);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1678,7 +1678,7 @@ static struct config_int ConfigureNamesInt[] =`
`1678`	`1678`	`{`
`1679`	`1679`	`{`
`1680`	`1680`	`{"archive_timeout",PGC_SIGHUP,WAL_ARCHIVING,`
`1681`		`-gettext_noop("Forces a switch to the nextxlog file if a "`
	`1681`	`+gettext_noop("Forces a switch to the nextWAL file if a "`
`1682`	`1682`	`"new file has not been started within N seconds."),`
`1683`	`1683`	`NULL,`
`1684`	`1684`	`GUC_UNIT_S`

Comments

(0)