Commit 51b03770 authored by Bruce Momjian's avatar Bruce Momjian

avoid xinv* table name conflict with large objects.

parent 34fa6c6b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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) ...@@ -313,9 +313,10 @@ vc_getrels(NameData *VacRelP)
} }
/* don't vacuum large objects for now - something breaks when we do */ /* 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[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", elog (NOTICE, "Rel %.*s: can't vacuum LargeObjects now",
NAMEDATALEN, rname); NAMEDATALEN, rname);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* *
* *
* IDENTIFICATION * 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 * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* *
...@@ -1081,7 +1081,7 @@ getTables(int *numTables) ...@@ -1081,7 +1081,7 @@ getTables(int *numTables)
sprintf(query, sprintf(query,
"SELECT oid, relname, relarch, relkind, relacl from pg_class " "SELECT oid, relname, relarch, relkind, relacl from pg_class "
"where (relkind = 'r' or relkind = 'S') and relname !~ '^pg_' " "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); res = PQexec(g_conn, query);
if (!res || if (!res ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment