Commit1cf7150

committed

Fix 64 bit XID again and one warning.

1 parent20f055f commit1cf7150Copy full SHA for 1cf7150

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
`@@ -1619,18 +1619,20 @@ StreamLog(void *arg)`
`1619`	`1619`	`starttli);`
`1620`	`1620`
`1621`	`1621`	`#ifPG_VERSION_NUM >=90600`
`1622`		`-StreamCtlctl;`
`1623`		`-ctl.startpos=startpos;`
`1624`		`-ctl.timeline=starttli;`
`1625`		`-ctl.sysidentifier=NULL;`
`1626`		`-ctl.basedir=basedir;`
`1627`		`-ctl.stream_stop=stop_streaming;`
`1628`		`-ctl.standby_message_timeout=standby_message_timeout;`
`1629`		`-ctl.partial_suffix=NULL;`
`1630`		`-ctl.synchronous= false;`
`1631`		`-ctl.mark_done= false;`
`1632`		`-if(ReceiveXlogStream(conn,&ctl)== false)`
`1633`		`-elog(ERROR,"Problem in recivexlog");`
	`1622`	`+{`
	`1623`	`+StreamCtlctl;`
	`1624`	`+ctl.startpos=startpos;`
	`1625`	`+ctl.timeline=starttli;`
	`1626`	`+ctl.sysidentifier=NULL;`
	`1627`	`+ctl.basedir=basedir;`
	`1628`	`+ctl.stream_stop=stop_streaming;`
	`1629`	`+ctl.standby_message_timeout=standby_message_timeout;`
	`1630`	`+ctl.partial_suffix=NULL;`
	`1631`	`+ctl.synchronous= false;`
	`1632`	`+ctl.mark_done= false;`
	`1633`	`+if(ReceiveXlogStream(conn,&ctl)== false)`
	`1634`	`+elog(ERROR,"Problem in recivexlog");`
	`1635`	`+}`
`1634`	`1636`	`#else`
`1635`	`1637`	`if(ReceiveXlogStream(conn,startpos,starttli,NULL,basedir,`
`1636`	`1638`	`stop_streaming,standby_message_timeout,NULL,`

Lines changed: 1 addition & 1 deletion

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

Comments

(0)