Skip to content

Commit 9db6485

Browse files
bmomjianbmomjian
committed
Move variable.c to commands/ and aclchk.c to catalog/.
1 parent deea69b commit 9db6485

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

‎src/backend/catalog/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.7 1997/12/20 00:23:26 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.8 1998/01/05 18:42:39 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,7 +15,7 @@ INCLUDE_OPT = -I..
1515

1616
CFLAGS+=$(INCLUDE_OPT)
1717

18-
OBJS = catalog.o heap.o index.o indexing.o \
18+
OBJS = catalog.o heap.o index.o indexing.o aclchk.o \
1919
pg_aggregate.o pg_operator.o pg_proc.o pg_type.o
2020

2121
all: SUBSYS.o global1.bki.source local1_template1.bki.source \

‎src/backend/tcop/aclchk.c renamed to ‎src/backend/catalog/aclchk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.22 1998/01/05 16:39:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.1 1998/01/05 18:42:40 momjian Exp $
1111
*
1212
* NOTES
1313
* See acl.h.

‎src/backend/commands/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.10 1997/12/20 00:23:32 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.11 1998/01/05 18:42:45 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,7 +17,8 @@ CFLAGS+=$(INCLUDE_OPT)
1717

1818
OBJS = async.o creatinh.o command.o copy.o defind.o define.o \
1919
remove.o rename.o vacuum.o version.o view.o cluster.o \
20-
recipe.o explain.o sequence.o trigger.o user.o proclang.o dbcommands.o
20+
recipe.o explain.o sequence.o trigger.o user.o proclang.o \
21+
dbcommands.o variable.o
2122

2223
all: SUBSYS.o
2324

‎src/backend/tcop/variable.c renamed to ‎src/backend/commands/variable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Routines for handling of 'SET var TO',
33
* 'SHOW var' and 'RESET var' statements.
44
*
5-
* $Id: variable.c,v 1.26 1998/01/05 16:39:35 momjian Exp $
5+
* $Id: variable.c,v 1.1 1998/01/05 18:42:50 momjian Exp $
66
*
77
*/
88

@@ -12,7 +12,7 @@
1212
#include <time.h>
1313
#include "postgres.h"
1414
#include "miscadmin.h"
15-
#include "tcop/variable.h"
15+
#include "commands/variable.h"
1616
#include "utils/builtins.h"
1717
#include "optimizer/internal.h"
1818

‎src/backend/tcop/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for tcop
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.14 1997/12/20 00:28:06 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.15 1998/01/05 18:42:59 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,7 +19,7 @@ ifeq ($(CC), gcc)
1919
CFLAGS+= -Wno-error
2020
endif
2121

22-
OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o variable.o
22+
OBJS= dest.o fastpath.o postgres.o pquery.o utility.o
2323

2424
all: SUBSYS.o
2525

‎src/backend/tcop/utility.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.35 1998/01/05 16:39:32 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.36 1998/01/05 18:43:09 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -35,6 +35,7 @@
3535
#include "commands/explain.h"
3636
#include "commands/trigger.h"
3737
#include "commands/proclang.h"
38+
#include "commands/variable.h"
3839

3940
#include "nodes/parsenodes.h"
4041
#include "../backend/parser/parse.h"
@@ -45,7 +46,6 @@
4546
#include "rewrite/rewriteDefine.h"
4647
#include "tcop/tcopdebug.h"
4748
#include "tcop/dest.h"
48-
#include "tcop/variable.h"
4949
#include "tcop/utility.h"
5050
#include "fmgr.h" /* For load_file() */
5151
#include "storage/fd.h"

‎src/include/utils/acl.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: acl.h,v 1.11 1997/09/08 21:54:47 momjian Exp $
9+
* $Id: acl.h,v 1.12 1998/01/05 18:43:18 momjian Exp $
1010
*
1111
* NOTES
1212
* For backward-compatability purposes we have to allow there
@@ -162,7 +162,6 @@ extern void ChangeAcl(char *relname, AclItem *mod_aip, unsigned modechg);
162162
extern AclId get_grosysid(char *groname);
163163
extern char *get_groname(AclId grosysid);
164164

165-
/* XXX move these elsewhere -pma */
166165
extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
167166
extern int32 pg_ownercheck(char *usename, char *value, int cacheid);
168167
extern int32

0 commit comments

Comments
 (0)