Move variable.c to commands/ and aclchk.c to catalog/.

diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index a8f3159256f1cf218c96a13ae0869a704e51ab33..050c93c8e8936034742d196e8d1dc09c7eaf71db 100644 (file)
--- 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 8064a316d594465afe331451b266b9f5320d5668..752399e7615dd558a9d764304153ac50a8544107 100644 (file)
--- 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 97bb016339b3ea5a87db3ba6824911eb5ec1b54c..a0ed959437963d0e070be24e89e2b27c09c326f0 100644 (file)
--- 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 82bd737c41f807c592ff9d4a405713427663995a..8ee7e777af8d79865b5914e139067d923762cae8 100644 (file)
--- 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 f756a133120b735135c9f6bf5a82402cdff7df96..908160fae1c407d6eb1d585145fdff8d80b963a2 100644 (file)
--- 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 ad484390ae75a7f818a8cc7c96c6f5d248472615..74cd794f01d2d6f1dcf31032dc8fb5dff4ab64bd 100644 (file)
--- 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 b35dbd199a9aed5b9a4a2b6f54d83817ddfc907b..8e0ebc84b6ca15680ddf1e1894d4a607b43ec28c 100644 (file)
--- 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