From 0feed4430546a979bae3cc520f5a0531676b9b1d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 29 Apr 2004 19:56:35 +0000 Subject: [PATCH] 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. --- src/bin/initdb/initdb.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index 9099d07c3f7..07ff82ec936 100644 --- 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 <