Commit5eeab9c

committed

In pg_upgrade, improve status wording now that we have per-database

status output for dump/restore.

1 parent113d25c commit5eeab9cCopy full SHA for 5eeab9c

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,17 @@ generate_old_dump(void)`
`18`	`18`	`{`
`19`	`19`	`intdbnum;`
`20`	`20`
`21`		`-prep_status("Creating catalog dump\n");`
`22`		`-`
`23`		`-pg_log(PG_REPORT,OVERWRITE_MESSAGE,"global objects");`
	`21`	`+prep_status("Creating dump of global objects");`
`24`	`22`
`25`	`23`	`/* run new pg_dumpall binary for globals */`
`26`	`24`	`exec_prog(UTILITY_LOG_FILE,NULL, true,`
`27`	`25`	`"\"%s/pg_dumpall\" %s --schema-only --globals-only --binary-upgrade %s -f %s",`
`28`	`26`	`new_cluster.bindir,cluster_conn_opts(&old_cluster),`
`29`	`27`	`log_opts.verbose ?"--verbose" :"",`
`30`	`28`	`GLOBALS_DUMP_FILE);`
	`29`	`+check_ok();`
	`30`	`+`
	`31`	`+prep_status("Creating dump of database schemas\n");`
`31`	`32`
`32`	`33`	`/* create per-db dump files */`
`33`	`34`	`for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ prepare_new_databases(void)`
`248`	`248`
`249`	`249`	`set_frozenxids();`
`250`	`250`
`251`		`-prep_status("Creating databases in the new cluster");`
	`251`	`+prep_status("Restoring global objects in the new cluster");`
`252`	`252`
`253`	`253`	`/*`
`254`	`254`	`* Install support functions in the global-object restore database to`
`@@ -297,7 +297,7 @@ create_new_objects(void)`
`297`	`297`	`}`
`298`	`298`	`check_ok();`
`299`	`299`
`300`		`-prep_status("Restoring databaseschema to new cluster\n");`
	`300`	`+prep_status("Restoring databaseschemas in the new cluster\n");`
`301`	`301`
`302`	`302`	`for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)`
`303`	`303`	`{`

Comments

(0)