Commitf7b70df

committed

Fix pg_upgrade to print the proper database name for file transfer

failures.

1 parenta3375be commitf7b70dfCopy full SHA for f7b70df

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ create_rel_filename_map(const char old_data, const char new_data,`
`107`	`107`	`if (strcmp(old_rel->nspname,new_rel->nspname)!=0\|\|`
`108`	`108`	`strcmp(old_rel->relname,new_rel->relname)!=0)`
`109`	`109`	`pg_log(PG_FATAL,"mismatch of relation id: database \"%s\", old rel %s.%s, new rel %s.%s\n",`
`110`		`-old_db,old_rel->nspname,old_rel->relname,`
	`110`	`+old_db->db_name,old_rel->nspname,old_rel->relname,`
`111`	`111`	`new_rel->nspname,new_rel->relname);`
`112`	`112`
`113`	`113`	`/* used only for logging and error reporing, old/new are identical */`
`@@ -188,8 +188,8 @@ get_db_infos(ClusterInfo *cluster)`
`188`	`188`	`/* we don't preserve pg_database.oid so we sort by name */`
`189`	`189`	`"ORDER BY 2");`
`190`	`190`
`191`		`-i_datname=PQfnumber(res,"datname");`
`192`	`191`	`i_oid=PQfnumber(res,"oid");`
	`192`	`+i_datname=PQfnumber(res,"datname");`
`193`	`193`	`i_spclocation=PQfnumber(res,"spclocation");`
`194`	`194`
`195`	`195`	`ntups=PQntuples(res);`
`@@ -198,7 +198,6 @@ get_db_infos(ClusterInfo *cluster)`
`198`	`198`	`for (tupnum=0;tupnum<ntups;tupnum++)`
`199`	`199`	`{`
`200`	`200`	`dbinfos[tupnum].db_oid=atooid(PQgetvalue(res,tupnum,i_oid));`
`201`		`-`
`202`	`201`	`snprintf(dbinfos[tupnum].db_name,sizeof(dbinfos[tupnum].db_name),"%s",`
`203`	`202`	`PQgetvalue(res,tupnum,i_datname));`
`204`	`203`	`snprintf(dbinfos[tupnum].db_tblspace,sizeof(dbinfos[tupnum].db_tblspace),"%s",`

Comments

(0)