From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 19 Jun 2007 09:58:41 +0000 (+0000)
Subject: Remove inappropriate my_postgresql_free_result() in db_close()
X-Git-Tag: Release-2.2.0~265
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aabbbc715b509c7a161a1750c33383fa3c622279;p=bacula%2Fbacula

Remove inappropriate my_postgresql_free_result() in db_close()
     routine.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5041 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index d7010647e9..bc5190e70b 100644
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -254,7 +254,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
       if (mdb->db_socket) {
          free(mdb->db_socket);
       }
-      my_postgresql_free_result(mdb);
       free(mdb);
    }
    V(mutex);
@@ -619,9 +618,7 @@ int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
    mdb->row_number   = -1;
    mdb->field_number = -1;
 
-   if (mdb->result != NULL) {
-      my_postgresql_free_result(mdb);
-   }
+   my_postgresql_free_result(mdb);
 
    for (int i=0; i < 10; i++) {
       mdb->result = PQexec(mdb->db, query);
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 29285b6a34..84df401a5d 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,8 @@
 
 General:
 19Jun07
+kes  Remove inappropriate my_postgresql_free_result() in db_close()
+     routine.
 kes  Fix bad return in FD when encryption signature not found.
      Probably caused a crash.
 kes  Inhibit missing encryption signature error messages for