IDENTIFY_SYSTEM now returns 3 fields, not 2

mhagander · mhagander · commit cedd6515ba68 · 2011-02-06T07:46:14.000+01:00
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -114,15 +114,15 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint)
 						"the primary server: %s",
 						PQerrorMessage(streamConn))));
 	}
-	if (PQnfields(res) != 2 || PQntuples(res) != 1)
+	if (PQnfields(res) != 3 || PQntuples(res) != 1)
 	{
 		int			ntuples = PQntuples(res);
 		int			nfields = PQnfields(res);
 
 		PQclear(res);
 		ereport(ERROR,
 				(errmsg("invalid response from primary server"),
-				 errdetail("Expected 1 tuple with 2 fields, got %d tuples with %d fields.",
+				 errdetail("Expected 1 tuple with 3 fields, got %d tuples with %d fields.",
 						   ntuples, nfields)));
 	}
 	primary_sysid = PQgetvalue(res, 0, 0);

Original file line number	Diff line number	Diff line change
`@@ -114,15 +114,15 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint)`
`114`	`114`	`"the primary server: %s",`
`115`	`115`	`PQerrorMessage(streamConn))));`
`116`	`116`	`}`
`117`		`- if (PQnfields(res) != 2 \|\| PQntuples(res) != 1)`
	`117`	`+ if (PQnfields(res) != 3 \|\| PQntuples(res) != 1)`
`118`	`118`	`{`
`119`	`119`	`int ntuples = PQntuples(res);`
`120`	`120`	`int nfields = PQnfields(res);`
`121`	`121`
`122`	`122`	`PQclear(res);`
`123`	`123`	`ereport(ERROR,`
`124`	`124`	`(errmsg("invalid response from primary server"),`
`125`		`- errdetail("Expected 1 tuple with 2 fields, got %d tuples with %d fields.",`
	`125`	`+ errdetail("Expected 1 tuple with 3 fields, got %d tuples with %d fields.",`
`126`	`126`	`ntuples, nfields)));`
`127`	`127`	`}`
`128`	`128`	`primary_sysid = PQgetvalue(res, 0, 0);`