From a0de6e7b97aee3ab00138e9e908e49b3cc8e3428 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Tue, 12 Jun 2007 13:54:58 +0000
Subject: [PATCH] Specifying a dbname should override the default database, not
 add to it. Fixes buildfarm failures on contribcheck.

---
 src/test/regress/pg_regress.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 8794e93a51..3f067428af 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.34 2007/06/12 13:26:45 mha Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.35 2007/06/12 13:54:58 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1794,6 +1794,10 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 				printf("pg_regress (PostgreSQL %s)\n", PG_VERSION);
 				exit_nicely(0);
 			case 1:
+				/* If a default database was specified, we need to remove it before we add
+				 * the specified one.
+				 */
+				free_stringlist(&dblist);
 				split_to_stringlist(strdup(optarg), ", ", &dblist);
 				break;
 			case 2: