Backup patch that should not be in Branch-5.0

diff --git a/bacula/src/cats/dbi.c b/bacula/src/cats/dbi.c
index 11f4003329bdf871d0ca35135b6aa00769a4ba7a..16e7546bd48910205d3d8f0e96857c158fbf3fb6 100644 (file)
--- 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 4cf709b26e6df794f84df29c08c107ca427c3406..681c209061ff875b06ac688255b48c16211fb9f4 100755 (executable)
--- 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 a2a355b2141c424c3e767ef78a14526a29ff9fc0..5f950fb5c1c835426eeef97daa4c993baf5992b8 100644 (file)
--- 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 c0d52cb2e60434fae4598e0e7c2129251e386dfa..c5757efced6115ec9371932d756e23c58ccab3bb 100644 (file)
--- 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 2e07ace931f9f1af6a1016f503e1874f22e3ae37..d18b24e891bec6d83fe726e6ae1f7138aa4509e6 100644 (file)
--- 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);
 }