Correct compile error

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

diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index 6af54383a3eaea7da7d89baf39e45b883222d914..6242fc3753d4b42987aecea1bb2fd4dec1918321 100644 (file)
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -7,8 +7,8 @@
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -92,6 +92,8 @@ db_init_database(JCR *jcr, const char *db_name, const char *db_user, const char
             Dmsg2(100, "DB REopen %d %s\n", mdb->ref_count, db_name);
             mdb->ref_count++;
             V(mutex);
+            Dmsg3(100, "initdb ref=%d connected=%d db=%p\n", mdb->ref_count,
+                  mdb->connected, mdb->db);
             return mdb;                  /* already open */
          }
       }
@@ -121,8 +123,10 @@ db_init_database(JCR *jcr, const char *db_name, const char *db_user, const char
    mdb->fname = get_pool_memory(PM_FNAME);
    mdb->path = get_pool_memory(PM_FNAME);
    mdb->esc_name = get_pool_memory(PM_FNAME);
-   mdb->esc_name2 = get_pool_memory(PM_FNAME);
+   mdb->esc_path = get_pool_memory(PM_FNAME);
    qinsert(&db_list, &mdb->bq);            /* put db in list */
+   Dmsg3(100, "initdb ref=%d connected=%d db=%p\n", mdb->ref_count,
+         mdb->connected, mdb->db);
    V(mutex);
    return mdb;
 }
@@ -143,7 +147,6 @@ db_open_database(JCR *jcr, B_DB *mdb)
       V(mutex);
       return 1;
    }
-   mdb->connected = false;
 
    if ((errstat=rwl_init(&mdb->lock)) != 0) {
       Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
@@ -153,10 +156,11 @@ db_open_database(JCR *jcr, B_DB *mdb)
    }
 
    /* connect to the database */
-#ifdef HAVE_EMBEDDED_MYSQL
-   mysql_server_init(0, NULL, NULL);
+#ifdef xHAVE_EMBEDDED_MYSQL
+// mysql_server_init(0, NULL, NULL);
 #endif
-   mysql_init(&(mdb->mysql));
+   mysql_init(&mdb->mysql);
+
    Dmsg0(50, "mysql_init done\n");
    /* If connection fails, try at 5 sec intervals for 30 seconds. */
    for (int retry=0; retry < 6; retry++) {
@@ -191,16 +195,15 @@ db_open_database(JCR *jcr, B_DB *mdb)
       return 0;
    }
 
+   mdb->connected = true;
    if (!check_tables_version(jcr, mdb)) {
       V(mutex);
       return 0;
    }
 
-#ifdef HAVE_THREAD_SAFE_MYSQL
-   my_thread_init();
-#endif
+   Dmsg3(100, "opendb ref=%d connected=%d db=%p\n", mdb->ref_count,
+         mdb->connected, mdb->db);
 
-   mdb->connected = true;
    V(mutex);
    return 1;
 }
@@ -213,16 +216,18 @@ db_close_database(JCR *jcr, B_DB *mdb)
    }
    db_end_transaction(jcr, mdb);
    P(mutex);
+   sql_free_result(mdb);
    mdb->ref_count--;
-#if defined(HAVE_THREAD_SAFE_MYSQL)
-   my_thread_end();
-#endif
+   Dmsg3(100, "closedb ref=%d connected=%d db=%p\n", mdb->ref_count,
+         mdb->connected, mdb->db);
    if (mdb->ref_count == 0) {
       qdchain(&mdb->bq);
-      if (mdb->connected && mdb->db) {
-         sql_close(mdb);
-#ifdef HAVE_EMBEDDED_MYSQL
-         mysql_server_end();
+      if (mdb->connected) {
+         Dmsg1(100, "close db=%p\n", mdb->db);
+         mysql_close(&mdb->mysql);
+
+#ifdef xHAVE_EMBEDDED_MYSQL
+//       mysql_server_end();
 #endif
       }
       rwl_destroy(&mdb->lock);
@@ -232,7 +237,7 @@ db_close_database(JCR *jcr, B_DB *mdb)
       free_pool_memory(mdb->fname);
       free_pool_memory(mdb->path);
       free_pool_memory(mdb->esc_name);
-      free_pool_memory(mdb->esc_name2);
+      free_pool_memory(mdb->esc_path);
       if (mdb->db_name) {
          free(mdb->db_name);
       }
@@ -253,6 +258,21 @@ db_close_database(JCR *jcr, B_DB *mdb)
    V(mutex);
 }
 
+/*
+ * This call is needed because the message channel thread
+ *  opens a database on behalf of a jcr that was created in
+ *  a different thread. MySQL then allocates thread specific
+ *  data, which is NOT freed when the original jcr thread
+ *  closes the database.  Thus the msgchan must call here
+ *  to cleanup any thread specific data that it created.
+ */
+void db_thread_cleanup()
+{ 
+#ifndef HAVE_WIN32
+   my_thread_end();
+#endif
+}
+
 /*
  * Return the next unique index (auto-increment) for
  * the given table.  Return NULL on error.
@@ -279,7 +299,7 @@ db_escape_string(char *snew, char *old, int len)
 {
    mysql_escape_string(snew, old, len);
 
-#ifdef DO_IT_MYSELF
+#ifdef xDO_IT_MYSELF
 
 /* Should use mysql_real_escape_string ! */
 unsigned long mysql_real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length);
@@ -350,7 +370,7 @@ int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler
    }
    if (result_handler != NULL) {
       if ((mdb->result = sql_use_result(mdb)) != NULL) {
-         int num_fields = 0;
+         int num_fields = sql_num_fields(mdb);
 
          /* We *must* fetch all rows */
          while ((row = sql_fetch_row(mdb)) != NULL) {
@@ -359,7 +379,6 @@ int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler
                 *  seen all the data it wants.  However, we
                 *  loop to the end of the data.
                 */
-               num_fields++;
                if (result_handler(ctx, num_fields, row)) {
                   send = false;
                }
@@ -374,6 +393,16 @@ int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler
 
 }
 
+void my_mysql_free_result(B_DB *mdb)
+{
+   db_lock(mdb);
+   if (mdb->result) {
+      mysql_free_result(mdb->result);
+      mdb->result = NULL;
+   }
+   db_unlock(mdb);
+}
+
 char *my_mysql_batch_lock_path_query = "LOCK TABLES Path write,     " 
                                        "            batch write,    " 
                                        "            Path as p write ";