Commit0fe2160

committed

pg_rewind: Fix busted sanity check.

As written, the code would only fail the sanity check if none of thecolumns returned by the server were of the expected type, but we wantit to fail if even one column is not of the expected type.Discussion:http://postgr.es/m/CA+TgmoYuY5zW7JEs+1hSS1D=V5K8h1SQuESrq=bMNeo0B71Sfw@mail.gmail.com

1 parentd86a2b7 commit0fe2160Copy full SHA for 0fe2160

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,8 +270,8 @@ receiveFileChunks(const char *sql)`
`270`	`270`	`if (PQnfields(res)!=3\|\|PQntuples(res)!=1)`
`271`	`271`	`pg_fatal("unexpected result set size while fetching remote files\n");`
`272`	`272`
`273`		`-if (PQftype(res,0)!=TEXTOID&&`
`274`		`-PQftype(res,1)!=INT4OID&&`
	`273`	`+if (PQftype(res,0)!=TEXTOID\|\|`
	`274`	`+PQftype(res,1)!=INT4OID\|\|`
`275`	`275`	`PQftype(res,2)!=BYTEAOID)`
`276`	`276`	`{`
`277`	`277`	`pg_fatal("unexpected data types in result set while fetching remote files: %u %u %u\n",`

Comments

(0)