Fix problem of COPY before vacuum.

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index ed131fa..ac22e83 100644 (file)
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -26,7 +26,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.26 1997/11/14 21:37:35 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.27 1997/11/15 17:15:34 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -346,12 +346,15 @@ fi
 
 echo
 
+echo "vacuuming template1"
+echo "vacuum analyze" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
+       grep -v "^DEBUG:"
+
 echo "loading pg_description"
 echo "copy pg_description from '$TEMPLATE_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
 echo "copy pg_description from '$GLOBAL_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
-
-echo "vacuuming template1"
-echo "vacuum" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
+echo "vacuum analyze pg_description" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
        grep -v "^DEBUG:"
 
 
+

diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index fafe274..dffa2db 100644 (file)
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.9 1997/11/14 05:57:42 momjian Exp $
+ * $Id: indexing.h,v 1.10 1997/11/15 17:15:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
 #define AttrDefaultIndex   "pg_attrdefind"
 #define RelCheckIndex     "pg_relcheckind"
 #define TriggerRelidIndex  "pg_trigrelidind"
-#define DescriptionObjOidIndex "pg_descrobjoidind"
+#define DescriptionObjIndex "pg_descrobjind"
 
 extern char *Name_pg_attr_indices[];
 extern char *Name_pg_proc_indices[];
@@ -119,7 +119,7 @@ DECLARE_INDEX(pg_relcheckind on pg_relcheck using btree(rcrelid oid_ops));
 
 DECLARE_INDEX(pg_trigrelidind on pg_trigger using btree(tgrelid oid_ops));
 
-DECLARE_INDEX(pg_descrobjoidind on pg_description using btree(objoid oid_ops));
+DECLARE_INDEX(pg_descrobjind on pg_description using btree(objoid oid_ops));
 
 /* now build indices in the initialization scripts */
 BUILD_INDICES