From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 15 Jan 2016 10:57:24 +0000 (+0100)
Subject: Fix typo in table name
X-Git-Tag: Release-7.4.0~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ce01317b5ce8c9710eed6201397a3b13686906a;p=bacula%2Fbacula

Fix typo in table name
---

diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index 309e0db6b5..55b6a85a5f 100644
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -579,17 +579,19 @@ void BDB::bdb_list_base_files_for_job(JCR *jcr, JobId_t jobid, DB_LIST_HANDLER *
     * Stupid MySQL is NON-STANDARD !
     */
    if (bdb_get_type_index() == SQL_TYPE_MYSQL) {
-      Mmsg(cmd, "SELECT CONCAT(Path.Path,File.Filename) AS Filename "
-           "FROM BaseFiles, File, Path "
+      Mmsg(cmd, "SELECT CONCAT(Path.Path,Filename.Name) AS Filename "
+           "FROM BaseFiles, File, Filename, Path "
            "WHERE BaseFiles.JobId=%s AND BaseFiles.BaseJobId = File.JobId "
            "AND BaseFiles.FileId = File.FileId "
+           "AND Filename.FilenameId=File.FilenameId "
            "AND Path.PathId=File.PathId",
          edit_int64(jobid, ed1));
    } else {
-      Mmsg(cmd, "SELECT Path.Path||File.Filename AS Filename "
-           "FROM BaseFiles, File, Path "
+      Mmsg(cmd, "SELECT Path.Path||Filename.Name AS Filename "
+           "FROM BaseFiles, File, Filename, Path "
            "WHERE BaseFiles.JobId=%s AND BaseFiles.BaseJobId = File.JobId "
            "AND BaseFiles.FileId = File.FileId "
+           "AND Filename.FilenameId=File.FilenameId "
            "AND Path.PathId=File.PathId",
            edit_int64(jobid, ed1));
    }
diff --git a/bacula/src/version.h b/bacula/src/version.h
index ea6b7a4aed..a39e638d87 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -6,8 +6,8 @@
 
 /* Note: there can be only *one* VERSION in this file */
 #define VERSION "7.4.0"
-#define BDATE   "14 January 2016"
-#define LSMDATE "14Jan16"
+#define BDATE   "15 January 2016"
+#define LSMDATE "15Jan16"
 
 #define RELEASE 1   /* Use ONLY in rpms */