From 365123c53c55affabba8bcbf362e36d3d4c9b420 Mon Sep 17 00:00:00 2001 From: Jozef Mlich Date: Thu, 20 Mar 2014 17:18:11 +0100 Subject: [PATCH] update to 9.3.4 minor version per release notes: http://www.postgresql.org/docs/9.3/static/release-9-3-4.html --- .gitignore | 3 ++ ...l-replay-of-locking-an-updated-tuple.patch | 46 ------------------- postgresql.spec | 12 +++-- sources | 6 +-- 4 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 postgresql-wal-replay-of-locking-an-updated-tuple.patch diff --git a/.gitignore b/.gitignore index e4470d7..9843fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ /postgresql-9.3.3.tar.bz2 /postgresql-9.3.3-US.pdf /postgresql-9.2.7.tar.bz2 +/postgresql-9.3.4-US.pdf +/postgresql-9.3.4.tar.bz2 +/postgresql-9.2.8.tar.bz2 diff --git a/postgresql-wal-replay-of-locking-an-updated-tuple.patch b/postgresql-wal-replay-of-locking-an-updated-tuple.patch deleted file mode 100644 index 592507c..0000000 --- a/postgresql-wal-replay-of-locking-an-updated-tuple.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 9a57858f1103b89a5674f0d50c5fe1f756411df6 -Author: Alvaro Herrera -Date: Thu Feb 27 11:13:39 2014 -0300 - - Fix WAL replay of locking an updated tuple - - We were resetting the tuple's HEAP_HOT_UPDATED flag as well as t_ctid on - WAL replay of a tuple-lock operation, which is incorrect when the tuple - is already updated. - - Back-patch to 9.3. The clearing of both header elements was there - previously, but since no update could be present on a tuple that was - being locked, it was harmless. - - Bug reported by Peter Geoghegan and Greg Stark in - CAM3SWZTMQiCi5PV5OWHb+bYkUcnCk=O67w0cSswPvV7XfUcU5g@mail.gmail.com and - CAM-w4HPTOeMT4KP0OJK+mGgzgcTOtLRTvFZyvD0O4aH-7dxo3Q@mail.gmail.com - respectively; diagnosis by Andres Freund. - -diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c -index 33fc5a7..d94980b 100644 ---- a/src/backend/access/heap/heapam.c -+++ b/src/backend/access/heap/heapam.c -@@ -7721,11 +7721,19 @@ heap_xlog_lock(XLogRecPtr lsn, XLogRecord *record) - - fix_infomask_from_infobits(xlrec->infobits_set, &htup->t_infomask, - &htup->t_infomask2); -- HeapTupleHeaderClearHotUpdated(htup); -+ -+ /* -+ * Clear relevant update flags, but only if the modified infomask says -+ * there's no update. -+ */ -+ if (HEAP_XMAX_IS_LOCKED_ONLY(htup->t_infomask)) -+ { -+ HeapTupleHeaderClearHotUpdated(htup); -+ /* Make sure there is no forward chain link in t_ctid */ -+ htup->t_ctid = xlrec->target.tid; -+ } - HeapTupleHeaderSetXmax(htup, xlrec->locking_xid); - HeapTupleHeaderSetCmax(htup, FirstCommandId, false); -- /* Make sure there is no forward chain link in t_ctid */ -- htup->t_ctid = xlrec->target.tid; - PageSetLSN(page, lsn); - MarkBufferDirty(buffer); - UnlockReleaseBuffer(buffer); diff --git a/postgresql.spec b/postgresql.spec index 6cf64db..c8b30d6 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -63,8 +63,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 9.3 -Version: 9.3.3 -Release: 2%{?dist} +Version: 9.3.4 +Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -79,7 +79,7 @@ Url: http://www.postgresql.org/ # in-place upgrade of an old database. In most cases it will not be critical # that this be kept up with the latest minor release of the previous series; # but update when bugs affecting pg_dump output are fixed. -%global prevversion 9.2.7 +%global prevversion 9.2.8 %global prevmajorversion 9.2 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -108,7 +108,6 @@ Patch3: postgresql-perl-rpath.patch Patch4: postgresql-config-comment.patch Patch5: postgresql-var-run-socket.patch Patch6: postgresql-man.patch -Patch7: postgresql-wal-replay-of-locking-an-updated-tuple.patch BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -336,7 +335,6 @@ benchmarks. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 # We used to run autoconf here, but there's no longer any real need to, # since Postgres ships with a reasonably modern configure script. @@ -1133,6 +1131,10 @@ fi %endif %changelog +* Thu Mar 20 2014 Jozef Mlich - 9.3.4-1 +- update to 9.3.4 minor version per release notes: + http://www.postgresql.org/docs/9.3/static/release-9-3-4.html + * Thu Mar 13 2014 Jozef Mlich - 9.3.3-2 - Fix WAL replay of locking an updated tuple kudos to Alvaro Herrera diff --git a/sources b/sources index 44f43f1..4b21ddd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0247b0a24e76a3f20cc50c06d0aa2412 postgresql-9.3.3.tar.bz2 -517e6f0f71ead14673093212089680d9 postgresql-9.3.3-US.pdf -610354e939d3b6d8d1a620504bc25fb2 postgresql-9.2.7.tar.bz2 +48bd3cff27b4fada760771688f1cecee postgresql-9.3.4-US.pdf +d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2 +c5c65a9b45ee53ead0b659be21ca1b97 postgresql-9.2.8.tar.bz2