Rename pg_temp to pg_sorttemp so it does not conflict with temp table names.

diff --git a/doc/TODO b/doc/TODO
index 46cced08a80b06267abccaa1a20521ee55c94b5e..99bccdfd876c6db5539d521b151d06a63c31bb8c 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -94,6 +94,8 @@ TYPES
 * Allow array on int8[]
 * Remove Money type, add money formatting for decimal type
 * Fix typein/out functions to not be user-callable
+* Add non-large-object binary field
+* Add index on NUMERIC type
 
 VIEWS
 
@@ -161,7 +163,7 @@ MISC
 * Show location of syntax error in query
 * Redesign the function call interface to handle NULLs better(Jan)
 * Document/trigger/rule so changes to pg_shadow create pg_pwd
-* Missing optimizer selectivities for date, etc.
+* Missing optimizer selectivities for date, r-tree, etc.
 * Overhaul mdmgr/smgr to fix double unlinking and double opens, cleanup
 * Overhaul bufmgr/lockmgr/transaction manager
 * Tables that start with xinv confused to be large objects
@@ -221,7 +223,8 @@ MISC
 * fix memory leak in cache code when non-existant table is referenced
 * In WHERE x=3 AND x=y, add y=3
 * pass atttypmod through parser in more cases(Bruce)
-* remov
+* remove duplicate type in/out functions for disk and net
+
 SOURCE CODE
 -----------
 * Add use of 'const' for varibles in source tree

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 2f3f6b4ad8b633b479bc4aea59ba7adc7af72868..6e28f04759ca708a37c103e6304717879beb7d18 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.88 1999/06/16 11:01:17 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.89 1999/07/08 02:46:37 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -254,7 +254,7 @@ heap_create(char *relname,
        {
                /* replace relname of caller */
                snprintf(relname, NAMEDATALEN, "pg_temp.%d.%u",
-                                (int) MyProcPid, uniqueId++);
+                                MyProcPid, uniqueId++);
        }
 
        /* ----------------

diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 0f61f2be91280021ea54c3f42aa14e03a45a58ce..223b25646d8e6cc24110973a77a1b6e555e0c0d6 100644 (file)
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $Id: fd.c,v 1.42 1999/05/26 12:55:51 momjian Exp $
+ *       $Id: fd.c,v 1.43 1999/07/08 02:46:39 momjian Exp $
  *
  * NOTES:
  *
@@ -670,7 +670,7 @@ OpenTemporaryFile(void)
         * transaction
         */
        snprintf(tempfilename, sizeof(tempfilename),
-                        "pg_temp%d.%ld", (int) getpid(), tempFileCounter++);
+                        "pg_sorttemp%d.%ld", MyProcPid, tempFileCounter++);
 
        /* Open the file */
 #ifndef __CYGWIN32__