Commit 6b70030
committed
Fix wrong merge resolution making pg_receivexlog fail in 9.2.
I bungled resolving a conflict while backpatching 2c0a485 to 9.2, by
passing mark_done = true to ReceiveXlogStream in pg_receivexlog.c (all
the other branches are ok). Since pg_receivexlog doesn't use a archive
directory that causes 'could not create archive status file "...": No
such 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 parent 3913b89 commit 6b70030
1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
321 | 321 | | |
322 | 322 | | |
323 | 323 | | |
324 | | - | |
| 324 | + | |
325 | 325 | | |
326 | 326 | | |
327 | 327 | | |
| |||
0 commit comments