Cleanup some minor oversights in optional-OIDs stuff.

diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 0e10991c43bde17b9891ca4669faa88418beecba..b7ac1b29552e58506dd1974fafd809fc9fd6b358 100644 (file)
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.43 2001/08/10 18:57:32 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.44 2001/08/10 20:52:24 tgl Exp $
 Postgres documentation
 -->
 
@@ -2155,7 +2155,7 @@ ALTER DOMAIN cities
     </para>
    </refsect3>
 
-   <refsect3 id="R3-SQL-INHERITANCE-1">
+   <refsect3 id="R3-SQL-OBJECTIDS-1">
     <title>
      Object IDs
     </title>

diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c
index 2ba46238a47f715eb5d136395aaeadeb5bf9bc83..819099329ced41ab90f722b69b30b53c17872434 100644 (file)
--- a/src/backend/catalog/pg_largeobject.c
+++ b/src/backend/catalog/pg_largeobject.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_largeobject.c,v 1.9 2001/06/22 19:16:21 wieck Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_largeobject.c,v 1.10 2001/08/10 20:52:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,13 +30,10 @@
  * We do this by inserting an empty first page, so that the object will
  * appear to exist with size 0.  Note that the unique index will reject
  * an attempt to create a duplicate page.
- *
- * Return value is OID assigned to the page tuple (any use in it?)
  */
-Oid
+void
 LargeObjectCreate(Oid loid)
 {
-       Oid                     retval;
        Relation        pg_largeobject;
        HeapTuple       ntup;
        Relation        idescs[Num_pg_largeobject_indices];
@@ -66,7 +63,7 @@ LargeObjectCreate(Oid loid)
        /*
         * Insert it
         */
-       retval = heap_insert(pg_largeobject, ntup);
+       heap_insert(pg_largeobject, ntup);
 
        /*
         * Update indices
@@ -81,8 +78,6 @@ LargeObjectCreate(Oid loid)
        heap_close(pg_largeobject, RowExclusiveLock);
 
        heap_freetuple(ntup);
-
-       return retval;
 }
 
 void

diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 02b22f618caf52c7880f36059c9cf378fb8e008f..6072cd39456c30f8db64d08690475d26b1dd3bd7 100644 (file)
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.88 2001/06/22 19:16:23 wieck Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.89 2001/08/10 20:52:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,7 +78,7 @@ inv_create(int flags)
         * Create the LO by writing an empty first page for it in
         * pg_largeobject
         */
-       (void) LargeObjectCreate(file_oid);
+       LargeObjectCreate(file_oid);
 
        /*
         * Advance command counter so that new tuple will be seen by later

diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h
index be1283d67e68925a090fa3f4c3b3c220602e37a5..030ab177a2fdb8e2cbf8dc51541bc99d7a136512 100644 (file)
--- a/src/include/catalog/pg_largeobject.h
+++ b/src/include/catalog/pg_largeobject.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_largeobject.h,v 1.8 2001/08/10 18:57:40 tgl Exp $
+ * $Id: pg_largeobject.h,v 1.9 2001/08/10 20:52:25 tgl Exp $
  *
  * NOTES
  *       the genbki.sh script reads this file and generates .bki
@@ -55,7 +55,7 @@ typedef FormData_pg_largeobject *Form_pg_largeobject;
 #define Anum_pg_largeobject_pageno             2
 #define Anum_pg_largeobject_data               3
 
-extern Oid     LargeObjectCreate(Oid loid);
+extern void LargeObjectCreate(Oid loid);
 extern void LargeObjectDrop(Oid loid);
 extern bool LargeObjectExists(Oid loid);
 

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index cfb8b051fa0662ade5411ab4621831549fbff5c7..63480d4965e44d8dc76ab93e5f57e3238eb05bdd 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.201 2001/08/10 18:57:40 tgl Exp $
+ * $Id: pg_proc.h,v 1.202 2001/08/10 20:52:25 tgl Exp $
  *
  * NOTES
  *       The script catalog/genbki.sh reads this file and generates .bki
@@ -1483,7 +1483,7 @@ DESCR("convert int4 to reltime");
 
 DATA(insert OID = 1215 (  obj_description      PGUID 14 f t f t 2 f    25 "26 19" 100 0 0 100  "select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = $2) and objsubid = 0" - ));
 DESCR("get description for object id and catalog name");
-DATA(insert OID = 1216 (  col_description      PGUID 14 f t f t 2 f    25 "26 23" 100 0 0 100  "select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = 'pg_class') and objsubid = $2" - ));
+DATA(insert OID = 1216 (  col_description      PGUID 14 f t f t 2 f    25 "26 23" 100 0 0 100  "select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = \'pg_class\') and objsubid = $2" - ));
 DESCR("get description for table column");
 
 DATA(insert OID = 1217 (  date_trunc      PGUID 12 f t f t 2 f 1184 "25 1184" 100 0 0 100      timestamp_trunc - ));