From f3b03cfc83594785ff04742238d9c80906f77063 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 1 Feb 2010 20:46:44 +0100
Subject: [PATCH] Backup patch that should not be in Branch-5.0

---
 bacula/src/cats/dbi.c        | 4 ----
 bacula/src/cats/ingres.c     | 6 +-----
 bacula/src/cats/mysql.c      | 4 ----
 bacula/src/cats/postgresql.c | 4 ----
 bacula/src/cats/sqlite.c     | 4 ----
 5 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/bacula/src/cats/dbi.c b/bacula/src/cats/dbi.c
index 11f4003329..16e7546bd4 100644
--- a/bacula/src/cats/dbi.c
+++ b/bacula/src/cats/dbi.c
@@ -372,10 +372,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
           free(mdb->db_driver);
       }
       free(mdb);
-      if (db_list->size() == 0) {
-         delete db_list;
-         db_list = NULL;
-      }
    }
    V(mutex);
 }
diff --git a/bacula/src/cats/ingres.c b/bacula/src/cats/ingres.c
index 4cf709b26e..681c209061 100755
--- a/bacula/src/cats/ingres.c
+++ b/bacula/src/cats/ingres.c
@@ -273,10 +273,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
          free(mdb->db_socket);
       }
       free(mdb);
-      if (db_list->size() == 0) {
-         delete db_list;
-         db_list = NULL;
-      }
    }
    V(mutex);
 }
@@ -288,7 +284,7 @@ void db_thread_cleanup()
  * Return the next unique index (auto-increment) for
  * the given table.  Return NULL on error.
  *
- * For Ingres, NULL causes the auto-increment value	SRE: true?
+ * For Ingres, NULL causes the auto-increment value     SRE: true?
  *  to be updated.
  */
 int db_next_index(JCR *jcr, B_DB *mdb, char *table, char *index)
diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index a2a355b214..5f950fb5c1 100644
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -268,10 +268,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
          free(mdb->db_socket);
       }
       free(mdb);
-      if (db_list->size() == 0) {
-         delete db_list;
-         db_list = NULL;
-      }
    }
    V(mutex);
 }
diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index c0d52cb2e6..c5757efced 100644
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -290,10 +290,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
          free(mdb->db_socket);
       }
       free(mdb);
-      if (db_list->size() == 0) {
-         delete db_list;
-         db_list = NULL;
-      }
    }
    V(mutex);
 }
diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index 2e07ace931..d18b24e891 100644
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -261,10 +261,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
          free(mdb->db_name);
       }
       free(mdb);
-      if (db_list->size() == 0) {
-         delete db_list;
-         db_list = NULL;
-      }
    }
    V(mutex);
 }
-- 
2.39.5