summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorItagaki Takahiro <itagaki.takahiro@gmail.com>2010-06-14 00:49:24 +0000
committerItagaki Takahiro <itagaki.takahiro@gmail.com>2010-06-14 00:49:24 +0000
commit9e3cd37576fdc1b10126194256c8ba7e63f760de (patch)
tree7f052a6057b190dc688ebf6fa40bc9935e8b9cb4
parent26b7abfa32b657e21911e82b38eeb8fc81c9dc77 (diff)
Remove max_standby_delay message from ps display of recovery process
in waiting status. The parameter is not so interesting in ps display because it is referable in postgresql.conf.
-rw-r--r--src/backend/storage/ipc/standby.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 204969d3cb8..a61a4e62169 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.24 2010/05/26 19:52:52 sriggs Exp $
+ * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.25 2010/06/14 00:49:24 itagaki Exp $
*
*-------------------------------------------------------------------------
*/
@@ -184,11 +184,9 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist,
int len;
old_status = get_ps_display(&len);
- new_status = (char *) palloc(len + 50);
+ new_status = (char *) palloc(len + 8 + 1);
memcpy(new_status, old_status, len);
- snprintf(new_status + len, 50,
- " waiting for max_standby_delay (%d ms)",
- MaxStandbyDelay);
+ strcpy(new_status + len, " waiting");
set_ps_display(new_status, false);
new_status[len] = '\0'; /* truncate off " waiting" */
}