diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/catalog/Makefile | 4 | ||||
-rw-r--r-- | src/backend/catalog/genbki.sh | 17 | ||||
-rw-r--r-- | src/backend/postmaster/postmaster.c | 22 |
3 files changed, 21 insertions, 22 deletions
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 383775d8476..bf36399daa5 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,7 +2,7 @@ # # Makefile for backend/catalog # -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.45 2003/01/14 23:19:34 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.46 2003/04/06 22:45:22 petere Exp $ # #------------------------------------------------------------------------- @@ -38,7 +38,7 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\ pg_includes := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include) postgres.bki postgres.description: genbki.sh $(POSTGRES_BKI_SRCS) \ - $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/pg_config.h + $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/pg_config_manual.h CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o postgres $(pg_includes) $(POSTGRES_BKI_SRCS) --set-version=$(VERSION) .PHONY: install-data diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh index 2fbb84494ca..901c33f1787 100644 --- a/src/backend/catalog/genbki.sh +++ b/src/backend/catalog/genbki.sh @@ -10,7 +10,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.28 2002/07/31 17:19:51 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.29 2003/04/06 22:45:22 petere Exp $ # # NOTES # non-essential whitespace is removed from the generated file. @@ -66,7 +66,7 @@ do echo " $CMDNAME [ -D define [...] ] [ -I dir ] --set-version=VERSION -o prefix files..." echo echo "Options:" - echo " -I path to postgres_ext.h and pg_config.h files" + echo " -I path to postgres_ext.h and pg_config_manual.h files" echo " -o prefix of output files" echo " --set-version PostgreSQL version number for initdb cross-check" echo @@ -126,11 +126,11 @@ for dir in $INCLUDE_DIRS; do fi done -# Get INDEX_MAX_KEYS from pg_config.h +# Get INDEX_MAX_KEYS from pg_config_manual.h # (who needs consistency?) for dir in $INCLUDE_DIRS; do - if [ -f "$dir/pg_config.h" ]; then - INDEXMAXKEYS=`grep '^#define[ ]*INDEX_MAX_KEYS' $dir/pg_config.h | $AWK '{ print $3 }'` + if [ -f "$dir/pg_config_manual.h" ]; then + INDEXMAXKEYS=`grep '^#define[ ]*INDEX_MAX_KEYS' $dir/pg_config_manual.h | $AWK '{ print $3 }'` break fi done @@ -152,9 +152,10 @@ for dir in $INCLUDE_DIRS; do done export BKIOBJECTID -# NOTE: we assume here that FUNC_MAX_ARGS has the same value as INDEX_MAX_KEYS, -# and don't read it separately from pg_config.h. This is OK because both of them -# must be equal to the length of oidvector. +# NOTE: we assume here that FUNC_MAX_ARGS has the same value as +# INDEX_MAX_KEYS, and don't read it separately from +# pg_config_manual.h. This is OK because both of them must be equal +# to the length of oidvector. INDEXMAXKEYS2=`expr $INDEXMAXKEYS '*' 2` || exit INDEXMAXKEYS4=`expr $INDEXMAXKEYS '*' 4` || exit diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 694a6e5a73f..0221c64773d 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.309 2003/03/24 22:40:14 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.310 2003/04/06 22:45:22 petere Exp $ * * NOTES * @@ -143,13 +143,12 @@ char *VirtualHost; /* * MaxBackends is the limit on the number of backends we can start. - * The default is established by configure, but it can be altered at - * postmaster start with the postmaster's -N switch. Note - * that a larger MaxBackends value will increase the size of the shared - * memory area as well as cause the postmaster to grab more kernel - * semaphores, even if you never actually use that many backends. + * Note that a larger MaxBackends value will increase the size of the + * shared memory area as well as cause the postmaster to grab more + * kernel semaphores, even if you never actually use that many + * backends. */ -int MaxBackends = DEF_MAXBACKENDS; +int MaxBackends; /* * ReservedBackends is the number of backends reserved for superuser use. @@ -160,7 +159,7 @@ int MaxBackends = DEF_MAXBACKENDS; * can make new connections" --- pre-existing superuser connections don't * count against the limit. */ -int ReservedBackends = 2; +int ReservedBackends; static char *progname = (char *) NULL; @@ -892,7 +891,7 @@ usage(const char *progname) #ifdef USE_ASSERT_CHECKING printf(gettext(" -A 1|0 enable/disable run-time assert checking\n")); #endif - printf(gettext(" -B NBUFFERS number of shared buffers (default %d)\n"), DEF_NBUFFERS); + printf(gettext(" -B NBUFFERS number of shared buffers\n")); printf(gettext(" -c NAME=VALUE set run-time parameter\n")); printf(gettext(" -d 1-5 debugging level\n")); printf(gettext(" -D DATADIR database directory\n")); @@ -903,10 +902,9 @@ usage(const char *progname) #ifdef USE_SSL printf(gettext(" -l enable SSL connections\n")); #endif - printf(gettext(" -N MAX-CONNECT maximum number of allowed connections (default %d)\n"), - DEF_MAXBACKENDS); + printf(gettext(" -N MAX-CONNECT maximum number of allowed connections\n")); printf(gettext(" -o OPTIONS pass 'OPTIONS' to each backend server\n")); - printf(gettext(" -p PORT port number to listen on (default %d)\n"), DEF_PGPORT); + printf(gettext(" -p PORT port number to listen on\n")); printf(gettext(" -S silent mode (start in background without logging output)\n")); printf(gettext(" --help show this help, then exit\n")); printf(gettext(" --version output version information, then exit\n")); |