Remove old code from bdb.c

[bacula/bacula] / bacula / src / cats / mysql.c

diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index f420b21f57437e94ed512c3d8e2acc3172190969..3dd0d6780709e61b4d07ab1d33be97a467768e37 100644 (file)
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -4,6 +4,8 @@
  *    other files are generic.
  *
  *    Kern Sibbald, March 2000
+ *
+ *    Version $Id$
  */
 
 /*
@@ -75,9 +77,11 @@ db_init_database(char *db_name, char *db_user, char *db_password)
    mdb->db_user = bstrdup(db_user);
    mdb->db_password = bstrdup(db_password);
    mdb->have_insert_id = TRUE;
-   mdb->errmsg = (char *) get_pool_memory(PM_EMSG); /* get error message buffer */
+   mdb->errmsg = get_pool_memory(PM_EMSG); /* get error message buffer */
    *mdb->errmsg = 0;
-   mdb->cmd = (char *) get_pool_memory(PM_EMSG);    /* get command buffer */
+   mdb->cmd = get_pool_memory(PM_EMSG);    /* get command buffer */
+   mdb->cached_path = get_pool_memory(PM_FNAME);
+   mdb->cached_path_id = 0;
    mdb->ref_count = 1;
    qinsert(&db_list, &mdb->bq);           /* put db in list */
    V(mutex);
@@ -97,11 +101,19 @@ db_open_database(B_DB *mdb)
       return 1;
    }
    mdb->connected = FALSE;
+#ifdef needed
    if (pthread_mutex_init(&mdb->mutex, NULL) != 0) {
       Mmsg1(&mdb->errmsg, "Unable to initialize DB mutex. ERR=%s\n", strerror(errno));
       V(mutex);
       return 0;
    }
+#endif
+
+   if (rwl_init(&mdb->lock) != 0) {
+      Mmsg1(&mdb->errmsg, "Unable to initialize DB lock. ERR=%s\n", strerror(errno));
+      V(mutex);
+      return 0;
+   }
 
    /* connect to the database */
    mysql_init(&(mdb->mysql));
@@ -141,6 +153,12 @@ It is probably not running or your password is incorrect.\n"),
       V(mutex);
       return 0;
    }
+
+   if (!check_tables_version(mdb)) {
+      V(mutex);
+      return 0;
+   }
+
    mdb->connected = TRUE;
    V(mutex);
    return 1;
@@ -156,9 +174,11 @@ db_close_database(B_DB *mdb)
       if (mdb->connected && mdb->db) {
         sql_close(mdb);
       }
-      pthread_mutex_destroy(&mdb->mutex);
+/*    pthread_mutex_destroy(&mdb->mutex); */
+      rwl_destroy(&mdb->lock);      
       free_pool_memory(mdb->errmsg);
       free_pool_memory(mdb->cmd);
+      free_pool_memory(mdb->cached_path);
       if (mdb->db_name) {
         free(mdb->db_name);
       }
@@ -201,10 +221,10 @@ int db_sql_query(B_DB *mdb, char *query, DB_RESULT_HANDLER *result_handler, void
 {
    SQL_ROW row;
   
-   P(mdb->mutex);
+   db_lock(mdb);
    if (sql_query(mdb, query) != 0) {
       Mmsg(&mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    if (result_handler != NULL) {
@@ -219,7 +239,7 @@ int db_sql_query(B_DB *mdb, char *query, DB_RESULT_HANDLER *result_handler, void
         sql_free_result(mdb);
       }
    }
-   V(mdb->mutex);
+   db_unlock(mdb);
    return 1;
 
 }