git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c

index 039370a8515f22621c00c24aa100098163abcaff..875dbafa110e9f7aa55f5d9eebe245e9962dee37 100644 (file)

--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c

+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.3 2010年02月03日 09:47:19 heikki Exp $

+ * $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.4 2010年02月25日 07:31:40 heikki Exp $

*

*-------------------------------------------------------------------------

*/

PGresult *res;

char cmd[64];

- Assert(startpoint.xlogid != 0 || startpoint.xrecoff != 0);

-

/* Connect */

snprintf(conninfo_repl, sizeof(conninfo_repl), "%s replication=true", conninfo);

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c

index bf533fff73dd7238cbe59034281fa0b99a781dc5..a8706ab06f6cbd5e93492f3a0e3d07df55869aef 100644 (file)

--- a/src/backend/replication/walsender.c

+++ b/src/backend/replication/walsender.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.7 2010年02月18日 11:13:46 heikki Exp $

+ * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.8 2010年02月25日 07:31:40 heikki Exp $

*

*-------------------------------------------------------------------------

*/

/* use volatile pointer to prevent code rearrangement */

volatile WalSnd *walsnd = MyWalSnd;

- /*

- * Invalid position means that we have not yet received the initial

- * CopyData message from the slave that indicates where to start the

- * streaming.

- */

- if (sentPtr.xlogid == 0 &&

- sentPtr.xrecoff == 0)

- return true;

-

/* Attempt to send all records flushed to the disk already */

SendRqstPtr = GetWriteRecPtr();