Fix base-job-test with Mysql

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 39f0fb334edc019c37c1b3649c3bfb878441d57b..60fa3b1c3442c90e9c72284dbc8cd6a31213691d 100644 (file)
--- 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 5157b87c46272cd3fe324789b47e4b9f68b3d350..35ef7db9fee055f596690f578c914a18e0fbfe37 100644 (file)
--- 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);
 }