aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/libpq/fe-connect.c
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2003-02-19 14:31:26 +0000
committerTatsuo Ishii <ishii@postgresql.org>2003-02-19 14:31:26 +0000
commite2a618fe25f9e02f17dacff4c3d2f117b56c7715 (patch)
treeeb789d9336e38269d0e97932325f313759e58ccd /src/interfaces/libpq/fe-connect.c
parentd5740d7e26ab59da1c4a037510defbb1334eaaf4 (diff)
downloadpostgresql-e2a618fe25f9e02f17dacff4c3d2f117b56c7715.tar.gz
postgresql-e2a618fe25f9e02f17dacff4c3d2f117b56c7715.zip
Fix for GUC client_encoding variable not being handled
correctly. See following thread for more details. Subject: [HACKERS] client_encoding directive is ignored in postgresql.conf From: Tatsuo Ishii <t-ishii@sra.co.jp> Date: Wed, 29 Jan 2003 22:24:04 +0900 (JST)
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
-rw-r--r--src/interfaces/libpq/fe-connect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index dd651fd2132..32ef6e115a5 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.223 2003/02/14 01:24:26 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.224 2003/02/19 14:31:26 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1744,7 +1744,7 @@ PQsetenvPoll(PGconn *conn)
* server for it. We must use begin/commit in
* case autocommit is off by default.
*/
- if (!PQsendQuery(conn, "begin; select getdatabaseencoding(); commit"))
+ if (!PQsendQuery(conn, "begin; select pg_client_encoding(); commit"))
goto error_return;
conn->setenv_state = SETENV_STATE_ENCODINGS_WAIT;