I thought we'd made initdb safe against newline-munging issues, but on

inspection we fixed only one of the two uses of COPY :-(.  Fix the other.
This is already correct in CVS tip, but 7.4.3 could use the patch.

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 9099d07c3f7ab1897a4fec5594eb7c48cb02a9fd..07ff82ec93633ac4c6b6b08e3bb60ab00dea4e48 100644 (file)
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -27,7 +27,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.204.2.1 2004/01/14 03:47:12 tgl Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.204.2.2 2004/04/29 19:56:35 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -1043,11 +1043,7 @@ $ECHO_N "loading pg_description... "$ECHO_C
        classname name, \
        objsubid int4, \
        description text) WITHOUT OIDS;
-    COPY tmp_pg_description FROM STDIN;
-EOF
-  cat "$POSTGRES_DESCR"
-  cat <<EOF
-\.
+    COPY tmp_pg_description FROM '$POSTGRES_DESCR';
     INSERT INTO pg_description SELECT \
        t.objoid, c.oid, t.objsubid, t.description \
     FROM tmp_pg_description t, pg_class c WHERE c.relname = t.classname;