Merge commit 'origin/recoveryinfra' into dev_hot_standby

diff --cc doc/src/sgml/config.sgml
Simple merge

diff --cc doc/src/sgml/func.sgml
Simple merge

diff --cc src/backend/access/transam/xlog.c
index e238d7c871e0440e07e2d7886d8a823f5df9e2e7,55763001796c178405ea4861c7c72e82009c5f9f..77769888a8dedfe2fc5c43f383813f3e40f449cb
--- 1/src/backend/access/transam/xlog.c
--- 2/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@@ -7079,8 -6552,9 +7149,9 @@@ CreateRestartPoint(int flags
                                        timestamptz_to_str(recoveryLastXTime))));
  
        LWLockRelease(CheckpointLock);
+       return true;
  }
 -
 +  
  /*
   * Write a NEXTOID log record
   */

diff --cc src/include/access/xlog.h
Simple merge

diff --cc src/include/catalog/pg_proc.h
Simple merge