aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2010-02-12 07:56:36 +0000
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2010-02-12 07:56:36 +0000
commit54cbd1757e6fe166673f66455557f0397b01e17c (patch)
tree51b2c00133919d72665d4b61e53adf6527ae8f9f /src
parent9fa01f6c8acbae4568f5e7b3d682235dd67c3a74 (diff)
downloadpostgresql-54cbd1757e6fe166673f66455557f0397b01e17c.tar.gz
postgresql-54cbd1757e6fe166673f66455557f0397b01e17c.zip
If primary_conninfo is not set, don't try to establish streaming
connection.
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/transam/xlog.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index d628ec708b0..4da8df4b0dc 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.371 2010/02/12 07:36:44 heikki Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.372 2010/02/12 07:56:36 heikki Exp $
*
*-------------------------------------------------------------------------
*/
@@ -8796,8 +8796,9 @@ XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,
* that when we later jump backwards to start redo at
* RedoStartLSN, we will have the logs streamed already.
*/
- RequestXLogStreaming(fetching_ckpt ? RedoStartLSN : *RecPtr,
- PrimaryConnInfo);
+ if (PrimaryConnInfo)
+ RequestXLogStreaming(fetching_ckpt ? RedoStartLSN : *RecPtr,
+ PrimaryConnInfo);
}
/*