diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-08-07 13:15:55 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-08-07 13:15:55 -0400 |
| commit | bcbecbce2fde3c6dfa9080db11663877808a007d (patch) | |
| tree | 35213efaf4cdeabbb00f1b739fcb72814aebf43b /src | |
| parent | 3676631c687009c2fadcb35e7d312e9eb8a98182 (diff) | |
| download | postgresql-bcbecbce2fde3c6dfa9080db11663877808a007d.tar.gz postgresql-bcbecbce2fde3c6dfa9080db11663877808a007d.zip | |
Don't propagate a null subtransaction snapshot up to parent transaction.
This oversight could cause logical decoding to fail to decode an outer
transaction containing changes, if a subtransaction had an XID but no
actual changes. Per bug #14279 from Marko Tiikkaja. Patch by Marko
based on analysis by Andrew Gierth.
Discussion: <20160804191757.1430.39011@wrigleys.postgresql.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 77375d91b28..9594b1c671b 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -807,13 +807,14 @@ ReorderBufferCommitChild(ReorderBuffer *rb, TransactionId xid, elog(ERROR, "subxact logged without previous toplevel record"); /* - * Pass the our base snapshot to the parent transaction if it doesn't have + * Pass our base snapshot to the parent transaction if it doesn't have * one, or ours is older. That can happen if there are no changes in the * toplevel transaction but in one of the child transactions. This allows - * the parent to simply use it's base snapshot initially. + * the parent to simply use its base snapshot initially. */ - if (txn->base_snapshot == NULL || - txn->base_snapshot_lsn > subtxn->base_snapshot_lsn) + if (subtxn->base_snapshot != NULL && + (txn->base_snapshot == NULL || + txn->base_snapshot_lsn > subtxn->base_snapshot_lsn)) { txn->base_snapshot = subtxn->base_snapshot; txn->base_snapshot_lsn = subtxn->base_snapshot_lsn; |