diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 6e980fcf4c..235a8cbc2e 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1,5 +1,5 @@ @@ -342,9 +342,7 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn); If PQconnectStart succeeds, the next stage is to poll libpq so that it may - proceed with the connection sequence. Loop thus: Consider a connection - inactive by default. If PQconnectPoll last returned PGRES_POLLING_ACTIVE, - consider it active instead. If PQconnectPoll(conn) last returned + proceed with the connection sequence. Loop thus: If PQconnectPoll(conn) last returned PGRES_POLLING_READING, perform a select() for reading on the socket determined using PQsocket(conn). If it last returned PGRES_POLLING_WRITING, perform a select() for writing on that same socket. If you have yet to call PQconnectPoll, i.e., after the call diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index ac57659365..78d0e20188 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.227 2003/03/18 22:11:48 petere Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.228 2003/03/20 06:23:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1206,9 +1206,6 @@ connectDBComplete(PGconn *conn) */ switch (flag) { - case PGRES_POLLING_ACTIVE: - break; - case PGRES_POLLING_OK: return 1; /* success! */ @@ -1926,9 +1923,6 @@ PQsetenv(PGconn *conn) */ switch (flag) { - case PGRES_POLLING_ACTIVE: - break; - case PGRES_POLLING_OK: return true; /* success! */ diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index f3be00ab62..8114d6e78e 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.88 2003/03/10 22:28:22 tgl Exp $ + * $Id: libpq-fe.h,v 1.89 2003/03/20 06:23:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,8 @@ typedef enum PGRES_POLLING_READING, /* These two indicate that one may */ PGRES_POLLING_WRITING, /* use select before polling again. */ PGRES_POLLING_OK, - PGRES_POLLING_ACTIVE /* Can call poll function immediately. */ + PGRES_POLLING_ACTIVE /* unused; keep for awhile for + * backwards compatibility */ } PostgresPollingStatusType; typedef enum