diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2001-07-06 19:04:23 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2001-07-06 19:04:23 +0000 |
| commit | 1e9e5defc256708ca40009640d337baeca5698ec (patch) | |
| tree | 408703c63e7d17b3cf170685d2e0792db9a721bd /src | |
| parent | 4fc5b32b4b7faa5428329e9681c73bf5cb553aa8 (diff) | |
| download | postgresql-1e9e5defc256708ca40009640d337baeca5698ec.tar.gz postgresql-1e9e5defc256708ca40009640d337baeca5698ec.zip | |
Use CONNECTION_OK to determine whether startup phase is complete.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 7fda1a81f5e..e215eb87e93 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.165 2001/07/06 17:58:53 petere Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.166 2001/07/06 19:04:23 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1409,7 +1409,6 @@ keep_going: /* We will come back to here until there if (areq == AUTH_REQ_OK) { /* We are done with authentication exchange */ - conn->startup_complete = TRUE; conn->status = CONNECTION_AUTH_OK; /* @@ -1910,7 +1909,6 @@ makeEmptyPGconn(void) freePGconn(conn); conn = NULL; } - conn->startup_complete = FALSE; return conn; } @@ -1976,7 +1974,7 @@ closePGconn(PGconn *conn) { /* Note that the protocol doesn't allow us to send Terminate messages during the startup phase. */ - if (conn->sock >= 0 && conn->startup_complete) + if (conn->sock >= 0 && conn->status == CONNECTION_OK) { /* diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index a33176e6dad..7d8848e3e9e 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-int.h,v 1.34 2001/07/06 17:58:53 petere Exp $ + * $Id: libpq-int.h,v 1.35 2001/07/06 19:04:23 petere Exp $ * *------------------------------------------------------------------------- */ @@ -278,7 +278,6 @@ struct pg_conn PQExpBufferData workBuffer; /* expansible string */ int client_encoding;/* encoding id */ - int startup_complete; }; /* String descriptions of the ExecStatusTypes. |