Commit8d430f6

committed

Fix 64 bit XID again and one warning.

1 parentcd96f2b commit8d430f6Copy full SHA for 8d430f6

File tree

+15

-13

lines changed

+15

-13

lines changed

Lines changed: 14 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1616,18 +1616,20 @@ StreamLog(void *arg)`
`1616`	`1616`	`starttli);`
`1617`	`1617`
`1618`	`1618`	`#ifPG_VERSION_NUM >=90600`
`1619`		`-StreamCtlctl;`
`1620`		`-ctl.startpos=startpos;`
`1621`		`-ctl.timeline=starttli;`
`1622`		`-ctl.sysidentifier=NULL;`
`1623`		`-ctl.basedir=basedir;`
`1624`		`-ctl.stream_stop=stop_streaming;`
`1625`		`-ctl.standby_message_timeout=standby_message_timeout;`
`1626`		`-ctl.partial_suffix=NULL;`
`1627`		`-ctl.synchronous= false;`
`1628`		`-ctl.mark_done= false;`
`1629`		`-if(ReceiveXlogStream(conn,&ctl)== false)`
`1630`		`-elog(ERROR,"Problem in recivexlog");`
	`1619`	`+{`
	`1620`	`+StreamCtlctl;`
	`1621`	`+ctl.startpos=startpos;`
	`1622`	`+ctl.timeline=starttli;`
	`1623`	`+ctl.sysidentifier=NULL;`
	`1624`	`+ctl.basedir=basedir;`
	`1625`	`+ctl.stream_stop=stop_streaming;`
	`1626`	`+ctl.standby_message_timeout=standby_message_timeout;`
	`1627`	`+ctl.partial_suffix=NULL;`
	`1628`	`+ctl.synchronous= false;`
	`1629`	`+ctl.mark_done= false;`
	`1630`	`+if(ReceiveXlogStream(conn,&ctl)== false)`
	`1631`	`+elog(ERROR,"Problem in recivexlog");`
	`1632`	`+}`
`1631`	`1633`	`#else`
`1632`	`1634`	`if(ReceiveXlogStream(conn,startpos,starttli,NULL,basedir,`
`1633`	`1635`	`stop_streaming,standby_message_timeout,NULL,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ pgBackupWriteResultSection(FILE out, pgBackup backup)`
`274`	`274`	`time2iso(timestamp,lengthof(timestamp),backup->end_time);`
`275`	`275`	`fprintf(out,"END_TIME='%s'\n",timestamp);`
`276`	`276`	`}`
`277`		`-fprintf(out,"RECOVERY_XID=%u\n",backup->recovery_xid);`
	`277`	`+fprintf(out,"RECOVERY_XID="XID_FMT"\n",backup->recovery_xid);`
`278`	`278`	`if (backup->recovery_time>0)`
`279`	`279`	`{`
`280`	`280`	`time2iso(timestamp,lengthof(timestamp),backup->recovery_time);`

Comments

(0)