From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 29 Apr 2004 19:56:35 +0000 (+0000)
Subject: I thought we'd made initdb safe against newline-munging issues, but on
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=c74223629e44b44efa7fe7de53393f29042f5426;p=users%2Fbernd%2Fpostgres.git

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 a04d605659..72b7f95e06 100644
--- 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;