diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-03-14 23:59:23 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-03-14 23:59:23 +0000 |
commit | a50f2fd76e322eae0f2a7f3516da1f2ddf82fef2 (patch) | |
tree | 1ba8e93236d6d8038729d8c42357ad7bf85cd034 /src/interfaces/libpq/fe-exec.c | |
parent | 34235a295b307d3c50b2a74b20936f01b4ba76be (diff) |
Repair unintentional damage to MULTIBYTE code.
Diffstat (limited to 'src/interfaces/libpq/fe-exec.c')
-rw-r--r-- | src/interfaces/libpq/fe-exec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 5d614ebe375..6b3999193d5 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.92 2000/03/11 03:08:36 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.93 2000/03/14 23:59:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -153,8 +153,11 @@ PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status) if (conn) { + /* copy connection data we might need for operations on PGresult */ result->noticeHook = conn->noticeHook; result->noticeArg = conn->noticeArg; + result->client_encoding = conn->client_encoding; + /* consider copying conn's errorMessage */ switch (status) { @@ -172,8 +175,10 @@ PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status) } else { + /* defaults... */ result->noticeHook = NULL; result->noticeArg = NULL; + result->client_encoding = 0; /* should be SQL_ASCII */ } return result; |