Also print the libpq error message when lo_create or lo_open fails

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 4d1205d2d145b703f46355032e2989314c2a11b2..25862470bdcbeb0eec02b6890e755abfca4622d9 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *     $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.182 2010/02/26 02:01:16 momjian Exp $
+ *     $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.183 2010/03/18 20:00:51 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -935,13 +935,13 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid, bool drop)
        {
            loOid = lo_create(AH->connection, oid);
            if (loOid == 0 || loOid != oid)
-               die_horribly(AH, modulename, "could not create large object %u\n",
-                            oid);
+               die_horribly(AH, modulename, "could not create large object %u: %s",
+                            oid, PQerrorMessage(AH->connection));
        }
        AH->loFd = lo_open(AH->connection, oid, INV_WRITE);
        if (AH->loFd == -1)
-           die_horribly(AH, modulename, "could not open large object %u\n",
-                        oid);
+           die_horribly(AH, modulename, "could not open large object %u: %s",
+                        oid, PQerrorMessage(AH->connection));
    }
    else
    {

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 52ba1c9d704614ed47af944797d81dae6fb70a89..2ff4e0c87486db2140ede8e129e5a39391be6385 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -25,7 +25,7 @@
  * http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.578 2010/03/11 04:36:43 tgl Exp $
+ *   $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.579 2010/03/18 20:00:51 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2117,7 +2117,7 @@ dumpBlobs(Archive *AH, void *arg)
            loFd = lo_open(g_conn, blobOid, INV_READ);
            if (loFd == -1)
            {
-               write_msg(NULL, "dumpBlobs(): could not open large object %u: %s",
+               write_msg(NULL, "could not open large object %u: %s",
                          blobOid, PQerrorMessage(g_conn));
                exit_nicely();
            }
@@ -2130,7 +2130,7 @@ dumpBlobs(Archive *AH, void *arg)
                cnt = lo_read(g_conn, loFd, buf, LOBBUFSIZE);
                if (cnt < 0)
                {
-                   write_msg(NULL, "dumpBlobs(): error reading large object %u: %s",
+                   write_msg(NULL, "error reading large object %u: %s",
                              blobOid, PQerrorMessage(g_conn));
                    exit_nicely();
                }