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 a04d605659f03306f87b7fb1b3f7aa6b347c3e54..72b7f95e0677c9fa9fcb8e8604e646bc05ff4760 100644 (file)
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -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;