From 23cb32660c841d21a376642e40d8cfbea6c5f010 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 16 Mar 2016 23:18:07 -0400 Subject: [PATCH] Fix "pg_bench -C -M prepared". This didn't work because when we dropped and re-established a database connection, we did not bother to reset session-specific state such as the statements-are-prepared flags. The st->prepared[] array certainly needs to be flushed, and I cleared a couple of other fields as well that couldn't possibly retain meaningful state for a new connection. In passing, fix some bogus comments and strange field order choices. Per report from Robins Tharakan. --- contrib/pgbench/pgbench.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 6c36ad2528a..e5510fb830b 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -204,7 +204,7 @@ typedef struct int state; /* state No. */ int cnt; /* xacts count */ int ecnt; /* error count */ - int listen; /* 0 indicates that an async query has been + int listen; /* 1 indicates that an async query has been * sent */ int sleeping; /* 1 indicates that the client is napping */ bool throttling; /* whether nap is for throttling */ @@ -1274,6 +1274,13 @@ top: } INSTR_TIME_SET_CURRENT(end); INSTR_TIME_ACCUM_DIFF(*conn_time, end, start); + + /* Reset session-local state */ + st->listen = 0; + st->sleeping = 0; + st->throttling = false; + st->is_throttled = false; + memset(st->prepared, 0, sizeof(st->prepared)); } /*