Final changes

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index a4eac976d0c6ddadb21dab36ae23f4faa3c829d6..896939b34646fdc9326eca7fcba28a473514d0c0 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -2,6 +2,11 @@
 
 General:
 Version 1.39.20 Beta released:    
+22Aug06
+kes  Correct missing Client table reference in SQL pointed out by
+     Marc.
+21Aug06
+kes  Fix Win32 build (new entrypoint, start baculafd).
 20Aug06
 kes  Add -n option to bconsole to turn off conio.
 kes  Print JobIds to be migrated in Job Report.

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 892d8247aab1f5981f0eedb1075f3e4eafaaaaf2..dc41a78054cb25ca2df9c95e7a6c832340769a44 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -28,6 +28,7 @@ Fixes for 1.39.20:
 - Many cleanups/enhancements for Win32 systems.
 - Correct improperly formated list command output reported by Dan.
 - Eric fixed RunScripts, which I (Kern) had broken in the last beta.
+- Correct Client migration SQL as pointed out by Marc.
 
 ==========================================
 

diff --git a/bacula/kernstodo b/bacula/kernstodo
index bf8f31e598a1ff6c9154b216f7ec48b765c7c6a8..4c5af74dd05f885fa2a428fec374188ac66eff94 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                     Kern's ToDo List
-                     19 August 2006
+                     22 August 2006
 
 Major development:      
 Project                     Developer
@@ -33,11 +33,13 @@ Document:
 Priority:
 
 For 1.39:
+- Implement Python event for backing up/restoring a file.
 - Fix wx-console scanning problem with commas in names.
 - Change dbcheck to tell users to use native tools for fixing
   broken databases, and to ensure they have the proper indexes.
 - add udev rules for Bacula devices.
-- Add manpages to the list of directories for make install.
+- Add manpages to the list of directories for make install. Notify
+  Scott
 - If a job terminates, the DIR connection can close before the
   Volume info is updated, leaving the File count wrong.
 - Look at why SIGPIPE during connection can cause seg fault in
@@ -1629,7 +1631,6 @@ Block Position: 0
 - Add ACL error messages in src/filed/acl.c.
 - Make authentication failures single threaded.
 - Make Dir and SD authentication errors single threaded.
-- Install man pages
 - Fix catreq.c digestbuf at line 411 in src/dird/catreq.c 
 - Make base64.c (bin_to_base64) take a buffer length 
   argument to avoid overruns.

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 7db104bbccbadd0a029d41a3b8f28dcf678db2dc..0fe24e0a6738e2abe09d35318d370bf1c3fb4535 100644 (file)
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -373,7 +373,7 @@ const char *sql_client =
 
 /* Get JobIds from regex'ed Client names */
 const char *sql_jobids_from_client =
-   "SELECT DISTINCT Job.JobId,Job.StartTime FROM Job,Pool"
+   "SELECT DISTINCT Job.JobId,Job.StartTime FROM Job,Pool,Client"
    " WHERE Client.Name='%s' AND Pool.Name='%s' AND Job.PoolId=Pool.PoolId"
    " AND Job.ClientId=Client.ClientId "
    " ORDER by Job.StartTime";

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 21ae96490c7ae3c1601aee1bf6b7f3601618dd19..971a25709d34608800ac6df004e7dd452ea54860 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.39.20"
-#define BDATE   "20 August 2006"
-#define LSMDATE "20Aug06"
+#define BDATE   "22 August 2006"
+#define LSMDATE "22Aug06"
 #define BYEAR "2006"       /* year for copyright messages in progs */
 
 /* Debug flags */

diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 630d67a460c68865166c8f8a10b817f42fab233b..a5284c28aefd85194a65f90ffd2dce6984ab79b4 100644 (file)
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -1,6 +1,9 @@
               Technical notes on version 1.39  
 
 General:
+22Aug06
+kes  Correct missing Client table reference in SQL pointed out by
+     Marc.
 21Aug06
 kes  Fix Win32 build (new entrypoint, start baculafd).
 20Aug06