summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-12-12 22:04:33 +0000
committerBruce Momjian1998-12-12 22:04:33 +0000
commitf1a24505bb9c6781ff712b4826586e92f2bafec6 (patch)
treef3ae253721fb109ec30297f8156c9749af033acd
parentfb6f7dc88d7ef0e1d36e9145df5bfb1865db88a7 (diff)
Included patches should fix following problems in the muti-byte
enabled PostgreSQL 6.4. o binary cursor does not work o pg_dumpall produces incorrect create database statemnt Tatsuo Ishii [email protected]
-rw-r--r--src/backend/access/common/printtup.c7
-rw-r--r--src/bin/pg_dump/pg_dumpall2
2 files changed, 3 insertions, 6 deletions
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 68459beb011..956df41a343 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.35 1998/09/01 04:26:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.35.2.1 1998/12/12 22:04:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -289,12 +289,9 @@ printtup_internal(HeapTuple tuple, TupleDesc typeinfo)
/* variable length, assume a varlena structure */
len = VARSIZE(attr) - VARHDRSZ;
-#ifdef MULTIBYTE
- pq_putncharlen(VARDATA(attr), len);
-#else
pq_putint(len, VARHDRSZ);
pq_putnchar(VARDATA(attr), len);
-#endif
+
#ifdef IPORTAL_DEBUG
{
char *d = VARDATA(attr);
diff --git a/src/bin/pg_dump/pg_dumpall b/src/bin/pg_dump/pg_dumpall
index 78344324cf7..36dbba71cc2 100644
--- a/src/bin/pg_dump/pg_dumpall
+++ b/src/bin/pg_dump/pg_dumpall
@@ -59,7 +59,7 @@ do
if createdb -help|grep encoding >/dev/null
then
- echo "create database with encoding='`pg_encoding $ENCODING`' $DATABASE;"
+ echo "create database $DATABASE with encoding='`pg_encoding $ENCODING`';"
else
echo "create database $DATABASE;"
fi