diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 4e8592ef568b7ea5291c9f13948b3fa45167818f..641ef80126b4b5052f54fd401d76e126f5437f94 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.36 1998/11/27 19:51:28 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.37 1998/12/12 22:04:09 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 78344324cf7995de6aa0fb9bfc673cb1c43442e3..36dbba71cc2c56a672ccb36404970b6c1fff852f 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