Skip to content

Commit aa23c70

Browse files
committed
BACKED OUT.
> Regression tests opr_sanity and sanity_check are now failing. Um, Bruce, I've said several times that I didn't think Perchine's large object changes should be applied until someone had actually reviewed them.
1 parent 4ed0485 commit aa23c70

File tree

10 files changed

+1097
-547
lines changed

10 files changed

+1097
-547
lines changed

src/backend/catalog/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for catalog
44
#
5-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.29 2000/10/21 15:55:21 momjian Exp $
5+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.30 2000/10/22 05:27:10 momjian Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -11,8 +11,7 @@ top_builddir = ../../..
1111
include $(top_builddir)/src/Makefile.global
1212

1313
OBJS = catalog.o heap.o index.o indexing.o aclchk.o \
14-
pg_aggregate.o pg_largeobject.o pg_operator.o pg_proc.o \
15-
pg_type.o
14+
pg_aggregate.o pg_operator.o pg_proc.o pg_type.o
1615

1716
BKIFILES = global.bki template1.bki global.description template1.description
1817

@@ -30,7 +29,7 @@ TEMPLATE1_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
3029
pg_proc.h pg_type.h pg_attribute.h pg_class.h \
3130
pg_inherits.h pg_index.h pg_statistic.h \
3231
pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
33-
pg_language.h pg_largeobject.h \
32+
pg_language.h \
3433
pg_aggregate.h pg_ipl.h pg_inheritproc.h \
3534
pg_rewrite.h pg_listener.h pg_description.h indexing.h \
3635
)

src/backend/catalog/indexing.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.70 2000/10/21 15:55:21 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.71 2000/10/22 05:27:10 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -51,8 +51,6 @@ char *Name_pg_inherits_indices[Num_pg_inherits_indices] =
5151
{InheritsRelidSeqnoIndex};
5252
char *Name_pg_language_indices[Num_pg_language_indices] =
5353
{LanguageOidIndex, LanguageNameIndex};
54-
char *Name_pg_largeobject_indices[Num_pg_largeobject_indices] =
55-
{LargeobjectLOIdIndex, LargeobjectLOIdPNIndex};
5654
char *Name_pg_listener_indices[Num_pg_listener_indices] =
5755
{ListenerPidRelnameIndex};
5856
char *Name_pg_opclass_indices[Num_pg_opclass_indices] =

src/backend/catalog/pg_largeobject.c

Lines changed: 0 additions & 135 deletions
This file was deleted.

src/backend/libpq/be-fsstubs.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.53 2000/10/21 15:55:22 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.54 2000/10/22 05:27:12 momjian Exp $
1212
*
1313
* NOTES
1414
* This should be moved to a more appropriate place. It is here
@@ -267,7 +267,7 @@ lo_creat(PG_FUNCTION_ARGS)
267267
PG_RETURN_OID(InvalidOid);
268268
}
269269

270-
lobjId = lobjDesc->id;
270+
lobjId = RelationGetRelid(lobjDesc->heap_r);
271271

272272
inv_close(lobjDesc);
273273

@@ -512,10 +512,8 @@ lo_commit(bool isCommit)
512512
{
513513
if (cookies[i] != NULL)
514514
{
515-
/*
516515
if (isCommit)
517516
inv_cleanindex(cookies[i]);
518-
*/
519517
cookies[i] = NULL;
520518
}
521519
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy