NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6b70030

committed

Fix wrong merge resolution making pg_receivexlog fail in 9.2.

I bungled resolving a conflict while backpatching2c0a485 to 9.2, bypassing mark_done = true to ReceiveXlogStream in pg_receivexlog.c (allthe other branches are ok). Since pg_receivexlog doesn't use a archivedirectory that causes 'could not create archive status file "...": Nosuch file or directory' errors.Until 9.2.11 is released this can be worked around by creating'archive_directory' in pg_receivexlog's target directory.Found by Sergey Konoplev.

1 parent3913b89 commit6b70030Copy full SHA for 6b70030

File tree

1 file changed

-1

lines changed

src/bin/pg_basebackup
- pg_receivexlog.c

1 file changed

-1

lines changed

`‎src/bin/pg_basebackup/pg_receivexlog.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ StreamLog(void)`
`321`	`321`	`progname,startpos.xlogid,startpos.xrecoff,timeline);`
`322`	`322`
`323`	`323`	`ReceiveXlogStream(conn,startpos,timeline,NULL,basedir,`
`324`		`-stop_streaming,standby_message_timeout, false,true);`
	`324`	`+stop_streaming,standby_message_timeout, false,false);`
`325`	`325`
`326`	`326`	`PQfinish(conn);`
`327`	`327`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6b70030

File tree

1 file changed

1 file changed

`‎src/bin/pg_basebackup/pg_receivexlog.c`

0 commit comments