Commit51b0377

committed

avoid xinv* table name conflict with large objects.

1 parent34fa6c6 commit51b0377Copy full SHA for 51b0377

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.34 1997/06/06 03:41:16 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.35 1997/06/07 05:18:47 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -313,9 +313,10 @@ vc_getrels(NameData *VacRelP)`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`/* don't vacuum large objects for now - something breaks when we do */`
`316`		`-if ( (strlen(rname)>4)&&rname[0]=='x'&&`
	`316`	`+if ( (strlen(rname)>5)&&rname[0]=='x'&&`
`317`	`317`	`rname[1]=='i'&&rname[2]=='n'&&`
`318`		`-(rname[3]=='v'\|\|rname[3]=='x'))`
	`318`	`+(rname[3]=='v'\|\|rname[3]=='x')&&`
	`319`	`+rname[4] >='0'&&rname[4] <='9')`
`319`	`320`	`{`
`320`	`321`	`elog (NOTICE,"Rel %.*s: can't vacuum LargeObjects now",`
`321`	`322`	`NAMEDATALEN,rname);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`* IDENTIFICATION`
`24`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.30 1997/06/05 22:59:45 momjian Exp $`
	`24`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.31 1997/06/07 05:19:06 momjian Exp $`
`25`	`25`	`*`
`26`	`26`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`27`	`27`	`*`
`@@ -1081,7 +1081,7 @@ getTables(int *numTables)`
`1081`	`1081`	`sprintf(query,`
`1082`	`1082`	`"SELECT oid, relname, relarch, relkind, relacl from pg_class "`
`1083`	`1083`	`"where (relkind = 'r' or relkind = 'S') and relname !~ '^pg_' "`
`1084`		`-"and relname !~ '^xinv' order by oid;");`
	`1084`	`+"and relname !~ '^xinv[0-9]' order by oid;");`
`1085`	`1085`
`1086`	`1086`	`res=PQexec(g_conn,query);`
`1087`	`1087`	`if (!res\|\|`

Comments

(0)