From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 11 Nov 2009 14:10:51 +0000 (+0100)
Subject: Fix base-job-test with Mysql
X-Git-Tag: Release-7.0.0~2582
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19c6aa017a404cef3c82bf929a9ef0562090cab1;p=bacula%2Fbacula

Fix base-job-test with Mysql
---

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 39f0fb334e..60fa3b1c34 100644
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -1206,7 +1206,7 @@ bool db_commit_base_file_attributes_record(JCR *jcr, B_DB *mdb)
       "AND A.Name = B.Name "
     "ORDER BY B.FileId", 
         edit_uint64(jcr->JobId, ed1), ed1, ed1);
-   ret = QUERY_DB(jcr, mdb, mdb->cmd);
+   ret = db_sql_query(mdb, mdb->cmd, NULL, NULL);
    jcr->nb_base_files_used = sql_affected_rows(mdb);
    db_cleanup_base_file(jcr, mdb);
 
diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 5157b87c46..35ef7db9fe 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -1105,7 +1105,7 @@ bool db_get_used_base_jobids(JCR *jcr, B_DB *mdb,
  "SELECT DISTINCT BaseJobId "
  "  FROM Job JOIN BaseFiles USING (JobId) "
  " WHERE Job.HasBase = 1 "
- "   AND JobId IN (%s) ", jobids);
+ "   AND Job.JobId IN (%s) ", jobids);
    return db_sql_query(mdb, buf.c_str(), db_list_handler, result);
 }