Merge branch 'recoveryinfra' into dev_hot_standby
authorSimon Riggs <sriggs@ebony.2ndQuadrant>
Wed, 25 Feb 2009 13:04:37 +0000 (13:04 +0000)
committerSimon Riggs <sriggs@ebony.2ndQuadrant>
Wed, 25 Feb 2009 13:04:37 +0000 (13:04 +0000)
commit6e52f2d4e02327f4546d8a407b73790aad987276
tree4d8f13494217dc084250c8eedc4bd72e4496ef8d
parent18a29ebb4c3c579916d2ef8e9ec4af50be5e8e02
parent306ba15ee4313ad7f42352ae63e29e4228d3ff4a
Merge branch 'recoveryinfra' into dev_hot_standby

Conflicts:

src/backend/access/transam/xlog.c
src/backend/postmaster/postmaster.c
src/include/access/xlog.h

Further changes to replace IsRecoveryProcessingMode() with RecoveryInProgress().
17 files changed:
doc/src/sgml/config.sgml
src/backend/access/heap/pruneheap.c
src/backend/access/transam/multixact.c
src/backend/access/transam/xact.c
src/backend/access/transam/xlog.c
src/backend/commands/discard.c
src/backend/postmaster/postmaster.c
src/backend/storage/ipc/procarray.c
src/backend/storage/lmgr/lock.c
src/backend/storage/lmgr/proc.c
src/backend/tcop/postgres.c
src/backend/tcop/utility.c
src/backend/utils/adt/txid.c
src/backend/utils/init/postinit.c
src/backend/utils/time/tqual.c
src/include/access/xlog.h
src/include/storage/proc.h