From 90b22029755121a61812e991838391bd40ba2bbf Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 16 Oct 2003 16:50:41 +0000 Subject: Fix bad interaction between NOTIFY processing and V3 extended query protocol, per report from Igor Shevchenko. NOTIFY thought it could do its thing if transaction blockState is TBLOCK_DEFAULT, but in reality it had better check the low-level transaction state is TRANS_DEFAULT as well. Formerly it was not possible to wait for the client in a state where the first is true and the second is not ... but now we can have such a state. Minor cleanup in StartTransaction() as well. --- src/backend/tcop/postgres.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/backend/tcop/postgres.c') diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 9c0af0d238b..ea247487e2c 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.372 2003/10/09 02:40:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.373 2003/10/16 16:50:41 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2660,7 +2660,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.372 $ $Date: 2003/10/09 02:40:18 $\n"); + puts("$Revision: 1.373 $ $Date: 2003/10/16 16:50:41 $\n"); } /* @@ -2796,7 +2796,7 @@ PostgresMain(int argc, char *argv[], const char *username) { pgstat_report_tabstat(); - if (IsTransactionBlock()) + if (IsTransactionOrTransactionBlock()) { set_ps_display("idle in transaction"); pgstat_report_activity(" in transaction"); -- cgit v1.2.3