From 9db64857e0bd31eee463e90c21aba52be8174726 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 5 Jan 1998 18:43:18 +0000
Subject: [PATCH] Move variable.c to commands/ and aclchk.c to catalog/.
---
src/backend/catalog/Makefile | 4 ++--
src/backend/{tcop => catalog}/aclchk.c | 2 +-
src/backend/commands/Makefile | 5 +++--
src/backend/{tcop => commands}/variable.c | 4 ++--
src/backend/tcop/Makefile | 4 ++--
src/backend/tcop/utility.c | 4 ++--
src/include/utils/acl.h | 3 +--
7 files changed, 13 insertions(+), 13 deletions(-)
rename src/backend/{tcop => catalog}/aclchk.c (99%)
rename src/backend/{tcop => commands}/variable.c (99%)
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index a8f3159256f..050c93c8e89 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.7 1997/12/20 00:23:26 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.8 1998/01/05 18:42:39 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -15,7 +15,7 @@ INCLUDE_OPT = -I..
CFLAGS+=$(INCLUDE_OPT)
-OBJS = catalog.o heap.o index.o indexing.o \
+OBJS = catalog.o heap.o index.o indexing.o aclchk.o \
pg_aggregate.o pg_operator.o pg_proc.o pg_type.o
all: SUBSYS.o global1.bki.source local1_template1.bki.source \
diff --git a/src/backend/tcop/aclchk.c b/src/backend/catalog/aclchk.c
similarity index 99%
rename from src/backend/tcop/aclchk.c
rename to src/backend/catalog/aclchk.c
index 8064a316d59..752399e7615 100644
--- a/src/backend/tcop/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.22 1998/01/05 16:39:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.1 1998/01/05 18:42:40 momjian Exp $
*
* NOTES
* See acl.h.
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index 97bb016339b..a0ed9594379 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -4,7 +4,7 @@
# Makefile for commands
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.10 1997/12/20 00:23:32 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.11 1998/01/05 18:42:45 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -17,7 +17,8 @@ CFLAGS+=$(INCLUDE_OPT)
OBJS = async.o creatinh.o command.o copy.o defind.o define.o \
remove.o rename.o vacuum.o version.o view.o cluster.o \
- recipe.o explain.o sequence.o trigger.o user.o proclang.o dbcommands.o
+ recipe.o explain.o sequence.o trigger.o user.o proclang.o \
+ dbcommands.o variable.o
all: SUBSYS.o
diff --git a/src/backend/tcop/variable.c b/src/backend/commands/variable.c
similarity index 99%
rename from src/backend/tcop/variable.c
rename to src/backend/commands/variable.c
index 82bd737c41f..8ee7e777af8 100644
--- a/src/backend/tcop/variable.c
+++ b/src/backend/commands/variable.c
@@ -2,7 +2,7 @@
* Routines for handling of 'SET var TO',
* 'SHOW var' and 'RESET var' statements.
*
- * $Id: variable.c,v 1.26 1998/01/05 16:39:35 momjian Exp $
+ * $Id: variable.c,v 1.1 1998/01/05 18:42:50 momjian Exp $
*
*/
@@ -12,7 +12,7 @@
#include <time.h>
#include "postgres.h"
#include "miscadmin.h"
-#include "tcop/variable.h"
+#include "commands/variable.h"
#include "utils/builtins.h"
#include "optimizer/internal.h"
diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index f756a133120..908160fae1c 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,7 +4,7 @@
# Makefile for tcop
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.14 1997/12/20 00:28:06 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.15 1998/01/05 18:42:59 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -19,7 +19,7 @@ ifeq ($(CC), gcc)
CFLAGS+= -Wno-error
endif
-OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o variable.o
+OBJS= dest.o fastpath.o postgres.o pquery.o utility.o
all: SUBSYS.o
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index ad484390ae7..74cd794f01d 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.35 1998/01/05 16:39:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.36 1998/01/05 18:43:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,6 +35,7 @@
#include "commands/explain.h"
#include "commands/trigger.h"
#include "commands/proclang.h"
+#include "commands/variable.h"
#include "nodes/parsenodes.h"
#include "../backend/parser/parse.h"
@@ -45,7 +46,6 @@
#include "rewrite/rewriteDefine.h"
#include "tcop/tcopdebug.h"
#include "tcop/dest.h"
-#include "tcop/variable.h"
#include "tcop/utility.h"
#include "fmgr.h" /* For load_file() */
#include "storage/fd.h"
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index b35dbd199a9..8e0ebc84b6c 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: acl.h,v 1.11 1997/09/08 21:54:47 momjian Exp $
+ * $Id: acl.h,v 1.12 1998/01/05 18:43:18 momjian Exp $
*
* NOTES
* For backward-compatability purposes we have to allow there
@@ -162,7 +162,6 @@ extern void ChangeAcl(char *relname, AclItem *mod_aip, unsigned modechg);
extern AclId get_grosysid(char *groname);
extern char *get_groname(AclId grosysid);
-/* XXX move these elsewhere -pma */
extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
extern int32 pg_ownercheck(char *usename, char *value, int cacheid);
extern int32
--
GitLab