From 19630e0cbc7ad11058176c4f57a6394cf59d11cb Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Fri, 25 Jun 1999 10:42:06 +0000
Subject: [PATCH] *** empty log message ***
---
src/interfaces/ecpg/ChangeLog | 4 ++++
src/interfaces/ecpg/lib/ecpglib.c | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 780cea362f7..0d37df4a7a1 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -603,5 +603,9 @@ Wed Jun 16 20:21:42 CEST 1999
Thu Jun 24 18:06:43 CEST 1999
- Fixed C comment bug that caused ecpg to not accept quoted quotes.
+
+Fri Jun 25 07:17:10 CEST 1999
+
+ - Changed error message in ecpglib.c to list correct database name.
- Set library version to 3.0.0
- Set ecpg version to 2.6.0
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
index 88c3057d9a3..b74febcd1cc 100644
--- a/src/interfaces/ecpg/lib/ecpglib.c
+++ b/src/interfaces/ecpg/lib/ecpglib.c
@@ -1238,7 +1238,7 @@ ECPGconnect(int lineno, const char *dbname, const char *user, const char *passwd
actual_connection = all_connections = this;
- ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "NULL", user ? "for user " : "", user ? user : "");
+ ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "<DEFAULT>", user ? "for user " : "", user ? user : "");
sqlca.sqlcode = 0;
@@ -1247,8 +1247,8 @@ ECPGconnect(int lineno, const char *dbname, const char *user, const char *passwd
if (PQstatus(this->connection) == CONNECTION_BAD)
{
ECPGfinish(this);
- ECPGlog("connect: could not open database %s %s%s in line %d\n", dbname ? dbname : "NULL", user ? "for user " : "", user ? user : "", lineno);
- register_error(ECPG_CONNECT, "connect: could not open database %s.", dbname ? dbname : "NULL");
+ ECPGlog("connect: could not open database %s %s%s in line %d\n", dbname ? dbname : "<DEFAULT>", user ? "for user " : "", user ? user : "", lineno);
+ register_error(ECPG_CONNECT, "connect: could not open database %s.", dbname ? dbname : "<DEFAULT>");
return false;
}
--
GitLab