From 29b058569bee5773c1d9a9852ca3b6db6f45c81b Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 11 Nov 2009 15:10:51 +0100 Subject: [PATCH] Fix base-job-test with Mysql --- bacula/src/cats/sql_create.c | 2 +- bacula/src/cats/sql_get.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); } -- 2.39.5