database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-18 17:41:14 +03:00
Code

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

Browse Source 
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.
This commit is contained in:
Tom Lane 2004-04-29 19:56:35 +00:00
parent 79e42a6eb2
commit 0feed44305
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/initdb/initdb.sh
View File

@ -27,7 +27,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # 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, \ classname name, \
objsubid int4, \ objsubid int4, \
description text) WITHOUT OIDS; description text) WITHOUT OIDS;
COPY tmp_pg_description FROM STDIN; COPY tmp_pg_description FROM '$POSTGRES_DESCR';
EOF
cat "$POSTGRES_DESCR"
cat <<EOF
\.
INSERT INTO pg_description SELECT \ INSERT INTO pg_description SELECT \
t.objoid, c.oid, t.objsubid, t.description \ t.objoid, c.oid, t.objsubid, t.description \
FROM tmp_pg_description t, pg_class c WHERE c.relname = t.classname; FROM tmp_pg_description t, pg_class c WHERE c.relname = t.classname;