From: Heikki Linnakangas <heikki@enterprisedb.com>
Date: Mon, 23 Feb 2009 07:53:26 +0000 (+0200)
Subject: Merge commit 'origin/master' into recoveryinfra
X-Git-Url: http://git.postgresql.org/gitweb/-?a=commitdiff_plain;h=30f96acd1a4ca704100c7b836a58e9ef3dc17b95;p=users%2Fsimon%2Fpostgres.git

Merge commit 'origin/master' into recoveryinfra

Conflicts:

	src/backend/access/transam/xlog.c
	src/backend/postmaster/postmaster.c
	src/include/storage/pmsignal.h
---

30f96acd1a4ca704100c7b836a58e9ef3dc17b95
diff --cc src/backend/access/transam/xlog.c
index 747379f61e,97fb14868a..bc8372ce3a
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@@ -2818,7 -2818,7 +2818,7 @@@ RestoreArchivedFile(char *path, const c
  	 * On SIGTERM, assume we have received a fast shutdown request, and exit
  	 * cleanly. It's pure chance whether we receive the SIGTERM first, or the
  	 * child process. If we receive it first, the signal handler will call
- 	 * proc_exit(1), otherwise we do it here. If we or the child process
 -	 * proc_exit(0), otherwise we do it here. If we or the child process
++	 * proc_exit, otherwise we do it here. If we or the child process
  	 * received SIGTERM for any other reason than a fast shutdown request,
  	 * postmaster will perform an immediate shutdown when it sees us exiting
  	 * unexpectedly.