projects / users / kgrittn / postgres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be23fe3 c4ae968)
Merge branch 'master' into serializable
authorKevin Grittner <Kevin.Grittner@wicourts.gov>
Sun, 18 Sep 2011 17:33:49 +0000 (12:33 -0500)
committerKevin Grittner <Kevin.Grittner@wicourts.gov>
Sun, 18 Sep 2011 17:33:49 +0000 (12:33 -0500)
Conflicts:
src/backend/access/heap/heapam.c
src/test/isolation/expected/prepared-transactions.out
src/test/isolation/expected/prepared-transactions_1.out

1  2 
src/backend/storage/lmgr/predicate.c patch | diff1 | diff2 | blob | history

diff --cc src/backend/storage/lmgr/predicate.c
Simple merge
Kevin Grittner's development, especially fully serializable transactions (See http://wiki.postgresql.org/wiki/Serializable for more info)