Commite8969c4

committed

In pg_upgrade, use pg_log() instead of prep_status() for

newline-terminated messages, per suggestion from Tom.Backpatch to 9.2.

1 parent962e0cc commite8969c4Copy full SHA for e8969c4

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ transfer_all_new_dbs(DbInfoArr *old_db_arr,`
`36`	`36`	`new_dbnum;`
`37`	`37`	`constchar*msg=NULL;`
`38`	`38`
`39`		`-prep_status("%s user relation files\n",`
	`39`	`+pg_log(PG_REPORT,"%s user relation files\n",`
`40`	`40`	`user_opts.transfer_mode==TRANSFER_MODE_LINK ?"Linking" :"Copying");`
`41`	`41`
`42`	`42`	`/* Scan the old cluster databases and transfer their files */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ pg_log(eLogType type, char *fmt,...)`
`81`	`81`	`if (type!=PG_VERBOSE\|\|log_opts.verbose)`
`82`	`82`	`{`
`83`	`83`	`fwrite(message,strlen(message),1,log_opts.internal);`
`84`		`-/* if we are using OVERWRITE_MESSAGE, add newline */`
	`84`	`+/* if we are using OVERWRITE_MESSAGE, add newlineto log file*/`
`85`	`85`	`if (strchr(message,'\r')!=NULL)`
`86`	`86`	`fwrite("\n",1,1,log_opts.internal);`
`87`	`87`	`fflush(log_opts.internal);`

Comments

(0)