From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 24 Mar 2004 11:04:18 +0000 (+0000)
Subject: Partial fix for sql_get.c problem
X-Git-Tag: Release-1.34.0~37
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fbf8fda8f355ef66e2a56de8d520e625001e88b3;p=bacula%2Fbacula

Partial fix for sql_get.c problem


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1147 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 8106e79f72..41f8387397 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -101,6 +101,8 @@ From Chris Hull:
   then list last 20 backups.
 - Add all pools in Dir conf to DB also update them to catch changed
   LabelFormats and such.
+- Update volume FromPool (or FromPool=xxx) refreshes the Volume defaults from Pool.
+- Update volumes FromPool=xxx does all volumes.
 
 
 For version 1.35:
diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 2f1c7bbe36..02981b9b92 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -320,10 +320,17 @@ int db_get_job_volume_names(JCR *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **Volum
    int i;
 
    db_lock(mdb);
+#ifdef HAVE_POSTGRESQL
    Mmsg(&mdb->cmd, 
         "SELECT DISTINCT VolumeName FROM JobMedia,Media WHERE "
+        "JobMedia.JobId=%u AND JobMedia.MediaId=Media.MediaId ", JobId);
+#else
+   Mmsg(&mdb->cmd, 
+        "SELECT VolumeName,VolIndex FROM JobMedia,Media WHERE "
         "JobMedia.JobId=%u AND JobMedia.MediaId=Media.MediaId "
+        "GROUP BY VolumeName "
         "ORDER BY VolIndex", JobId);
+#endif
 
    Dmsg1(130, "VolNam=%s\n", mdb->cmd);
    *VolumeNames[0] = 0;
diff --git a/bacula/src/version.h b/bacula/src/version.h
index ec4c04dc9a..751b6bb7eb 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -2,8 +2,8 @@
 #undef  VERSION
 #define VERSION "1.33.4"
 #define VSTRING "1"
-#define BDATE   "22 Mar 2004"
-#define LSMDATE "22Mar04"
+#define BDATE   "23 Mar 2004"
+#define LSMDATE "23Mar04"
 
 /* Debug flags */
 #undef  DEBUG