Fix minor bug in isolationtester.

tglsfdc · tglsfdc · commit 5d91d78fe95f · 2018-10-17T15:06:38.000-04:00
If the lock wait query failed, isolationtester would report the
PQerrorMessage from some other connection, meaning there would be
no message or an unrelated one.  This seems like a pretty unlikely
occurrence, but if it did happen, this bug could make it really
difficult/confusing to figure out what happened.  That seems to
justify patching all the way back.

In passing, clean up another place where the "wrong" conn was used
for an error report.  That one's not actually buggy because it's
a different alias for the same connection, but it's still confusing
to the reader.
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
@@ -593,7 +593,7 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
 		if (!PQsendQuery(conn, step->sql))
 		{
 			fprintf(stdout, "failed to send query for step %s: %s\n",
-					step->name, PQerrorMessage(conns[1 + step->session]));
+					step->name, PQerrorMessage(conn));
 			exit_nicely();
 		}
 
@@ -742,7 +742,7 @@ try_complete_step(Step *step, int flags)
 					PQntuples(res) != 1)
 				{
 					fprintf(stderr, "lock wait query failed: %s",
-							PQerrorMessage(conn));
+							PQerrorMessage(conns[0]));
 					exit_nicely();
 				}
 				waiting = ((PQgetvalue(res, 0, 0))[0] == 't');

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ run_permutation(TestSpec testspec, int nsteps, Step *steps)`
`593`	`593`	`if (!PQsendQuery(conn, step->sql))`
`594`	`594`	`{`
`595`	`595`	`fprintf(stdout, "failed to send query for step %s: %s\n",`
`596`		`- step->name, PQerrorMessage(conns[1 + step->session]));`
	`596`	`+ step->name, PQerrorMessage(conn));`
`597`	`597`	`exit_nicely();`
`598`	`598`	`}`
`599`	`599`
`@@ -742,7 +742,7 @@ try_complete_step(Step *step, int flags)`
`742`	`742`	`PQntuples(res) != 1)`
`743`	`743`	`{`
`744`	`744`	`fprintf(stderr, "lock wait query failed: %s",`
`745`		`- PQerrorMessage(conn));`
	`745`	`+ PQerrorMessage(conns[0]));`
`746`	`746`	`exit_nicely();`
`747`	`747`	`}`
`748`	`748`	`waiting = ((PQgetvalue(res, 0, 0))[0] == 't');`