avoid xinv* table name conflict with large objects.

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 5bd5cbf98e362fdbcb37c66483fa0e2de8b2cd95..4cbb8b6608acee6d87280ba2d26c4a0b71dd0315 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.34 1997/06/06 03:41:16 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.35 1997/06/07 05:18:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -313,9 +313,10 @@ vc_getrels(NameData *VacRelP)
        }
 
        /* don't vacuum large objects for now - something breaks when we do */
-       if ( (strlen(rname) > 4) && rname[0] == 'x' &&
+       if ( (strlen(rname) > 5) && rname[0] == 'x' &&
                rname[1] == 'i' && rname[2] == 'n' &&
-               (rname[3] == 'v' || rname[3] == 'x'))
+               (rname[3] == 'v' || rname[3] == 'x') &&
+               rname[4] >= '0' && rname[4] <= '9')
        {
            elog (NOTICE, "Rel %.*s: can't vacuum LargeObjects now", 
                        NAMEDATALEN, rname);

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 1a2f1c19dcb38c75c08765ff4ee3e5d633fb13a3..d3d6d26ffe7f84fb21ac8ff41433ef783ad75399 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.30 1997/06/05 22:59:45 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.31 1997/06/07 05:19:06 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -1081,7 +1081,7 @@ getTables(int *numTables)
     sprintf(query, 
             "SELECT oid, relname, relarch, relkind, relacl from pg_class "
             "where (relkind = 'r' or relkind = 'S') and relname !~ '^pg_' "
-            "and relname !~ '^xinv' order by oid;");
+            "and relname !~ '^xinv[0-9]' order by oid;");
 
     res = PQexec(g_conn, query);
     if (!res ||