diff options
| author | Jan Wieck <JanWieck@Yahoo.com> | 1999-05-20 16:50:08 +0000 |
|---|---|---|
| committer | Jan Wieck <JanWieck@Yahoo.com> | 1999-05-20 16:50:08 +0000 |
| commit | 3de11d6526165154fe90bc161384e579dcdf1715 (patch) | |
| tree | 3caccc584122bbbe020375d09abd547e71e9edf0 /src/bin/initdb | |
| parent | 33773af95bb110e9bfe805370a8b236df03d98fb (diff) | |
| download | postgresql-3de11d6526165154fe90bc161384e579dcdf1715.tar.gz | |
Removed the automatic installation of built procedural languages
from initdb again.
Added two new commands, createlang and destroylang to bin. These
hopefully end this damned mklang.sql discussion.
Jan
Diffstat (limited to 'src/bin/initdb')
| -rw-r--r-- | src/bin/initdb/Makefile | 3 | ||||
| -rw-r--r-- | src/bin/initdb/initdb.sh | 22 |
2 files changed, 2 insertions, 23 deletions
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 1f92057c01..facc454d88 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.12 1999/05/12 10:35:43 wieck Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.13 1999/05/20 16:50:05 wieck Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,6 @@ all: initdb initdb: initdb.sh sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/' \ - -e 's/__DLSUFFIX__/$(DLSUFFIX)/' \ initdb.sh > initdb install: initdb diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index b8316e2693..139c967b05 100644 --- a/src/bin/initdb/initdb.sh +++ b/src/bin/initdb/initdb.sh @@ -26,7 +26,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.59 1999/05/12 10:35:43 wieck Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.60 1999/05/20 16:50:06 wieck Exp $ # #------------------------------------------------------------------------- @@ -491,26 +491,6 @@ echo "CREATE RULE \"_RETpg_indexes\" AS ON SELECT TO pg_indexes DO INSTEAD \ AND I.oid = X.indexrelid;" | \ postgres $PGSQL_OPT template1 > /dev/null -if [ -f $PGLIB/plpgsql__DLSUFFIX__ ] ; then - echo "Installing PL/pgSQL as trusted procedural language" - echo "CREATE FUNCTION plpgsql_call_handler () RETURNS opaque \ - AS '$PGLIB/plpgsql__DLSUFFIX__' LANGUAGE 'C';" | \ - postgres $PGSQL_OPT template1 > /dev/null - echo "CREATE TRUSTED PROCEDURAL LANGUAGE 'plpgsql' \ - HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL';" | \ - postgres $PGSQL_OPT template1 > /dev/null -fi - -if [ -f $PGLIB/pltcl__DLSUFFIX__ ] ; then - echo "Installing PL/Tcl as trusted procedural language" - echo "CREATE FUNCTION pltcl_call_handler () RETURNS opaque \ - AS '$PGLIB/pltcl__DLSUFFIX__' LANGUAGE 'C';" | \ - postgres $PGSQL_OPT template1 > /dev/null - echo "CREATE TRUSTED PROCEDURAL LANGUAGE 'pltcl' \ - HANDLER pltcl_call_handler LANCOMPILER 'PL/Tcl';" | \ - postgres $PGSQL_OPT template1 > /dev/null -fi - echo "Loading pg_description" echo "copy pg_description from '$TEMPLATE_DESCR'" | \ postgres $PGSQL_OPT template1 > /dev/null |