Commit97d3291

committed

Merge commit 'cd96f2b374039b468ee4bd53909cf15747ed1e84' into PGPRO9_6

2 parentse19f8be +cd96f2b commit97d3291Copy full SHA for 97d3291

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static void pg_start_backup(const char label, bool smooth, pgBackup backup);`
`64`	`64`	`staticvoidpg_stop_backup(pgBackup*backup);`
`65`	`65`	`staticboolpg_is_standby(void);`
`66`	`66`	`staticvoidget_lsn(PGconnconn,PGresultres,XLogRecPtr*lsn,boolstop_backup);`
`67`		`-staticvoidget_xid(PGresultres,uint32xid);`
	`67`	`+staticvoidget_xid(PGresultres,TransactionIdxid);`
`68`	`68`	`staticvoidpg_ptrack_clear(void);`
`69`	`69`	`staticboolpg_ptrack_support(void);`
`70`	`70`	`staticboolpg_ptrack_enable(void);`
`@@ -1042,14 +1042,14 @@ get_lsn(PGconn conn, PGresult res, XLogRecPtr *lsn, bool stop_backup)`
`1042`	`1042`	`* Get XID from result of txid_current() after pg_stop_backup().`
`1043`	`1043`	`*/`
`1044`	`1044`	`staticvoid`
`1045`		`-get_xid(PGresultres,uint32xid)`
	`1045`	`+get_xid(PGresultres,TransactionIdxid)`
`1046`	`1046`	`{`
`1047`	`1047`	`if (res==NULL\|\|PQntuples(res)!=1\|\|PQnfields(res)!=1)`
`1048`	`1048`	`elog(ERROR,`
`1049`	`1049`	`"result of txid_current() is invalid: %s",`
`1050`	`1050`	`PQerrorMessage(connection));`
`1051`	`1051`
`1052`		`-if (sscanf(PQgetvalue(res,0,0),"%u",xid)!=1)`
	`1052`	`+if (sscanf(PQgetvalue(res,0,0),XID_FMT,xid)!=1)`
`1053`	`1053`	`{`
`1054`	`1054`	`elog(ERROR,`
`1055`	`1055`	`"result of txid_current() is invalid: %s",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ catalog_read_ini(const char *path)`
`337`	`337`	`{'s',0,"stop-lsn",NULL,SOURCE_ENV },`
`338`	`338`	`{'t',0,"start-time",NULL,SOURCE_ENV },`
`339`	`339`	`{'t',0,"end-time",NULL,SOURCE_ENV },`
`340`		`-{'u',0,"recovery-xid",NULL,SOURCE_ENV },`
	`340`	`+{'U',0,"recovery-xid",NULL,SOURCE_ENV },`
`341`	`341`	`{'t',0,"recovery-time",NULL,SOURCE_ENV },`
`342`	`342`	`{'I',0,"data-bytes",NULL,SOURCE_ENV },`
`343`	`343`	`{'u',0,"block-size",NULL,SOURCE_ENV },`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@`
`45`	`45`	`#defineDIR_PERMISSION(0700)`
`46`	`46`	`#defineFILE_PERMISSION(0600)`
`47`	`47`
	`48`	`+#ifndefPGPRO_EE`
	`49`	`+#defineXID_FMT "%u"`
	`50`	`+#endif`
	`51`	`+`
`48`	`52`	`/* backup mode file */`
`49`	`53`	`typedefstructpgFile`
`50`	`54`	`{`
`@@ -119,7 +123,7 @@ typedef struct pgBackup`
`119`	`123`	`time_tstart_time;`
`120`	`124`	`time_tend_time;`
`121`	`125`	`time_trecovery_time;`
`122`		`-uint32recovery_xid;`
	`126`	`+TransactionIdrecovery_xid;`
`123`	`127`
`124`	`128`	`/* Different sizes (-1 means nothing was backed up) */`
`125`	`129`	`/*`
`@@ -159,7 +163,7 @@ typedef struct pgRecoveryTarget`
`159`	`163`	`booltime_specified;`
`160`	`164`	`time_trecovery_target_time;`
`161`	`165`	`boolxid_specified;`
`162`		`-unsignedintrecovery_target_xid;`
	`166`	`+TransactionIdrecovery_target_xid;`
`163`	`167`	`boolrecovery_target_inclusive;`
`164`	`168`	`}pgRecoveryTarget;`
`165`	`169`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ checkIfCreateRecoveryConf(const char *target_time,`
`775`	`775`	`constchar*target_inclusive)`
`776`	`776`	`{`
`777`	`777`	`time_tdummy_time;`
`778`		`-unsignedintdummy_xid;`
	`778`	`+TransactionIddummy_xid;`
`779`	`779`	`booldummy_bool;`
`780`	`780`	`pgRecoveryTarget*rt;`
`781`	`781`
`@@ -798,7 +798,11 @@ checkIfCreateRecoveryConf(const char *target_time,`
`798`	`798`	`if (target_xid)`
`799`	`799`	`{`
`800`	`800`	`rt->xid_specified= true;`
`801`		`-if (parse_uint32(target_xid,&dummy_xid))`
	`801`	`+#ifdefPGPRO_EE`
	`802`	`+if (parse_uint64(target_xid,&dummy_xid))`
	`803`	`+#else`
	`804`	`+if (parse_uint32(target_xid,&dummy_xid))`
	`805`	`+#endif`
`802`	`806`	`rt->recovery_target_xid=dummy_xid;`
`803`	`807`	`else`
`804`	`808`	`elog(ERROR,"cannot create recovery.conf with %s",target_xid);`

Comments

(0)