Fix typo bug in Hot Standby from recent refactoring. Bug introduced

simonat2ndQuadrant · simonat2ndQuadrant · commit 5cbf6dceea1a · 2010-02-11T19:35:22.000Z
into code recently patched by Andres Freund, so quickly fixed by him
when bug report from Tatsuo Ishii arrived.
diff --git 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.10 2010/02/02 22:01:53 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.11 2010/02/11 19:35:22 sriggs Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -290,7 +290,7 @@ ResolveRecoveryConflictWithDatabase(Oid dbid)
 	 */
 	while (CountDBBackends(dbid) > 0)
 	{
-		CancelDBBackends(dbid, PROCSIG_RECOVERY_CONFLICT_TABLESPACE, true);
+		CancelDBBackends(dbid, PROCSIG_RECOVERY_CONFLICT_DATABASE, true);
 
 		/*
 		 * Wait awhile for them to die so that we avoid flooding an

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1994, Regents of the University of California`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.10 2010/02/02 22:01:53 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.11 2010/02/11 19:35:22 sriggs Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -290,7 +290,7 @@ ResolveRecoveryConflictWithDatabase(Oid dbid)`
`290`	`290`	`*/`
`291`	`291`	`while (CountDBBackends(dbid) > 0)`
`292`	`292`	`{`
`293`		`- CancelDBBackends(dbid, PROCSIG_RECOVERY_CONFLICT_TABLESPACE, true);`
	`293`	`+ CancelDBBackends(dbid, PROCSIG_RECOVERY_CONFLICT_DATABASE, true);`
`294`	`294`
`295`	`295`	`/*`
`296`	`296`	`* Wait awhile for them to die so that we avoid flooding an`