diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/catalog/Makefile | 5 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 7 | ||||
| -rw-r--r-- | src/backend/utils/init/globals.c | 7 |
3 files changed, 6 insertions, 13 deletions
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 085e473a3c5..09651f60827 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -4,7 +4,7 @@ # Makefile for catalog # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.4 1997/11/13 03:22:18 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.5 1997/11/15 20:57:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -29,8 +29,7 @@ SUBSYS.o: $(OBJS) GENBKI= ./genbki.sh GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \ - pg_database.h pg_demon.h pg_magic.h pg_defaults.h \ - pg_variable.h pg_server.h pg_user.h pg_hosts.h \ + pg_database.h pg_variable.h pg_user.h \ pg_group.h pg_log.h \ ) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 9d42b753f44..ab14e80ba1e 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.66 1997/11/14 06:09:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.67 1997/11/15 20:57:09 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -3366,10 +3366,9 @@ relation_name: SpecialRuleRelation } | ColId { - /* disallow refs to magic system tables */ + /* disallow refs to variable system tables */ if (strcmp(LogRelationName, $1) == 0 - || strcmp(VariableRelationName, $1) == 0 - || strcmp(MagicRelationName, $1) == 0) + || strcmp(VariableRelationName, $1) == 0) elog(WARN,"%s cannot be accessed by users",$1); else $$ = $1; diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 95e0abfd37a..ba109f35008 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.15 1997/11/02 15:26:12 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.16 1997/11/15 20:57:27 momjian Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -107,13 +107,8 @@ char *IndexedCatalogNames[] = { */ char *SharedSystemRelationNames[] = { DatabaseRelationName, - DefaultsRelationName, - DemonRelationName, GroupRelationName, - HostsRelationName, LogRelationName, - MagicRelationName, - ServerRelationName, UserRelationName, VariableRelationName, 0 |