From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 21 Nov 2010 11:35:13 +0000 (+0100)
Subject: Add missing MarkId in mysql accurate query
X-Git-Tag: Release-7.0.0~1363
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a679ff58d6d146ab05707f5475e00384d308931b;p=bacula%2Fbacula

Add missing MarkId in mysql accurate query
---

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index 9dac77f7f7..7549452d3b 100644
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -367,12 +367,12 @@ const char *select_recent_version_with_basejob_and_delta_default =
 "FROM Job, File, ( "
     "SELECT MAX(JobTDate) AS JobTDate, PathId, FilenameId, MarkId "
       "FROM ( "
-        "SELECT JobTDate, PathId, FilenameId "   /* Get all normal files */
-          "FROM File JOIN Job USING (JobId) "    /* from selected backup */
+        "SELECT JobTDate, PathId, FilenameId, MarkId " /* Get all normal files */
+          "FROM File JOIN Job USING (JobId) "          /* from selected backup */
          "WHERE File.JobId IN (%s) "
           "UNION ALL "
-        "SELECT JobTDate, PathId, FilenameId "   /* Get all files from */ 
-          "FROM BaseFiles "                      /* BaseJob */
+        "SELECT JobTDate, PathId, FilenameId, MarkId " /* Get all files from */ 
+          "FROM BaseFiles "                            /* BaseJob */
                "JOIN File USING (FileId) "
                "JOIN Job  ON    (BaseJobId = Job.JobId) "
          "WHERE BaseFiles.JobId IN (%s) "        /* Use Max(JobTDate) to find */