projects / users / kgrittn / postgres.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit470c093fae91edf046ba695157e2d59d2198c02f
tree2705f583e9a88ae792c7695e46915f11d37949c6tree
parentbe23fe31eba216d4631fdcc4353edb08a1265b47commit | diff
parentc4ae968633b37e3b0a5da83e9d7d2a5518191564commit | diff
Merge branch 'master' into serializable

Conflicts:
src/backend/access/heap/heapam.c
src/test/isolation/expected/prepared-transactions.out
src/test/isolation/expected/prepared-transactions_1.out
src/backend/storage/lmgr/predicate.c diff1 | diff2 | blob | history
Kevin Grittner's development, especially fully serializable transactions (See http://wiki.postgresql.org/wiki/Serializable for more info)