Commitfeaa891

authored and

committed

Fix RDMS build of multimaster

1 parent33f01b4 commitfeaa891Copy full SHA for feaa891

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ static int MtmWaitSocket(int sd, bool forWrite, timestamp_t timeoutMsec)`
`214`	`214`	`FD_SET(sd,&set);`
`215`	`215`	`tv.tv_sec= (deadline-now)/USECS_PER_SEC;`
`216`	`216`	`tv.tv_usec= (deadline-now)%USECS_PER_SEC;`
`217`		`-}while ((rc=pg_select([sd+1,forWrite ?NULL :&set,forWrite ?&set :NULL,NULL,&tv,MtmUseRDMA))<0&&errno==EINTR);`
	`217`	`+}while ((rc=pg_select(sd+1,forWrite ?NULL :&set,forWrite ?&set :NULL,NULL,&tv,MtmUseRDMA))<0&&errno==EINTR);`
`218`	`218`
`219`	`219`	`returnrc;`
`220`	`220`	`}`
`@@ -688,7 +688,7 @@ static void MtmAcceptIncomingConnections()`
`688`	`688`	`if (gateway<0) {`
`689`	`689`	`MTM_ELOG(ERROR,"Arbiter failed to create socket: %s",strerror(errno));`
`690`	`690`	`}`
`691`		`-if (pg_setsockopt(gateway,SOL_SOCKET,SO_REUSEADDR, (char*)&on,sizeofon)<0) {`
	`691`	`+if (pg_setsockopt(gateway,SOL_SOCKET,SO_REUSEADDR, (char*)&on,sizeofon,MtmUseRDMA)<0) {`
`692`	`692`	`MTM_ELOG(ERROR,"Arbiter failed to set options for socket: %s",strerror(errno));`
`693`	`693`	`}`
`694`	`694`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`#include"fmgr.h"`
`24`	`24`	`#include"miscadmin.h"`
`25`	`25`	`#include"pg_socket.h"`
`26`		`-#include"libpq-fe.h"`
`27`	`26`	`#include"pqexpbuffer.h"`
`28`	`27`	`#include"access/xact.h"`
`29`	`28`	`#include"access/clog.h"`
`@@ -42,6 +41,7 @@`
`42`	`41`	`#include"replication/origin.h"`
`43`	`42`	`#include"utils/portal.h"`
`44`	`43`	`#include"tcop/pquery.h"`
	`44`	`+#include"libpq-int.h"`
`45`	`45`
`46`	`46`	`#include"multimaster.h"`
`47`	`47`	`#include"spill.h"`

Comments

(0)