- Update doc

- Fix misspelled #define in mysql.c for threading pointed out
  by a user.
- Fix incorrect prototype.
- Attempt to fix Solaris crash in SD during status command.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index a4896d52dd9da105fabcba6a783df291aa641846..ffaa7b0612b4a37cf105b5ccfa44ca07fdda9192 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -11,17 +11,11 @@ Version 1.35                Kern (see below)
 ========================================================
 
 1.35 Items to do for release:
-- Document a get out of jail procedure if everything breaks if 
-  you lost/broke the Catalog -- do the same for "I know my
-  file is there how do I get it back?".
 
+Maybe for 1.35:
 - Add Pool/Storage override regression test.
-- Add relabel regression test.
 - Add delete JobId to regression.
 - Add bscan to four-concurrent-jobs regression.
-
-   
-Maybe for 1.35:
 - Look at patches/bacula_db.b2z postgresql that loops during restore.
   See Gregory Wright.
 - Add IPv6 to regression
@@ -63,6 +57,9 @@ Testing to do: (painful)
 
 
 For 1.37 Testing/Documentation:
+- Add bandwidth limiting.
+- Add acks every once and a while from the SD to keep
+  the line from timing out.
 - When an error in input occurs and conio beeps, you can back
   up through the prompt.
 - Detect fixed tape block mode during positioning by looking at
@@ -86,7 +83,6 @@ For 1.37 Testing/Documentation:
 
 Fix:
    Kern,
-
    mt status and tapeinfo output are attached. Default blocksize was
    originally 512 bytes. I ran the following test on my machine:
 
@@ -131,8 +127,6 @@ Fix:
    General status bits on (1010000):
     ONLINE IM_REP_EN
 
-
-
 Wish list:  
 - see lzma401.zip in others directory for new compression
   algorithm/library.
@@ -1372,3 +1366,8 @@ Block Position: 0
 - Backspace to beginning of line (conio) does not erase first char.
 - Fix possible bug in update volumefrompool (email 9/28 from
   jesk@killall.org
+- Add relabel regression test.
+- Document a get out of jail procedure if everything breaks if 
+  you lost/broke the Catalog -- do the same for "I know my
+  file is there how do I get it back?".
+

diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index 1fd12e0157aebc0fc773a8cc9f195e3874138256..1fc4d8aba22f66b9a7671aab41c191d07b79e7a9 100644 (file)
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -176,7 +176,7 @@ It is probably not running or your password is incorrect.\n"),
       return 0;
    }
 
-#ifdef HAVE_TREAD_SAFE_MYSQL
+#ifdef HAVE_THREAD_SAFE_MYSQL
    my_thread_init();
 #endif
 

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 4dbef213882f55d39df110c730df63156a2bbb66..72b168adb24501c529bb1c4e305bbe74cbf09725 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -45,7 +45,7 @@ extern int do_backup(JCR *jcr);
 extern bool do_mac(JCR *jcr);
 extern int do_admin(JCR *jcr);
 extern int do_restore(JCR *jcr);
-extern int do_verify(JCR *jcr);
+extern bool do_verify(JCR *jcr);
 
 /* Imported variables */
 extern time_t watchdog_time;

diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c
index 1034be67dc9ac7184f6e474d60cc7f48c3b9f0b9..7fd44efa053235f7099def21d58e5f6876be760a 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -200,7 +200,7 @@ static bool despool_data(DCR *dcr, bool commit)
 
    Dmsg0(100, "Despooling data\n");
    Jmsg(jcr, M_INFO, 0, _("%s spooled data to Volume. Despooling %s bytes ...\n"),
-        commit?"Committing":"Writting",
+        commit?"Committing":"Writing",
        edit_uint64_with_commas(jcr->dcr->dev->spool_size, ec1));
    dcr->spooling = false;
    lock_device(dcr->dev);

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 74398e7a427de87b5d2ad0856374a1e1ca715258..cf73279d1901ee22c498ff137bc71b6279b64302 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -252,8 +252,8 @@ static void list_running_jobs(BSOCK *user)
                   job_type_to_str(jcr->JobType),
                   JobName,
                   jcr->JobId,
-                  jcr->dcr->VolumeName,
-                  jcr->device->device_name);
+                   jcr->dcr?jcr->dcr->VolumeName:"*none*",
+                   jcr->device?jcr->device->device_name:"none");
         sec = time(NULL) - jcr->run_time;
         if (sec <= 0) {
            sec = 1;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 61cfa78779a77d0385bfbfe4c8f7ee07e8fcf009..2f38b0dae04075b302a3805fd532b602c4215eda 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.8"
-#define BDATE   "04 October 2004"
-#define LSMDATE "04Oct04"
+#define BDATE   "07 October 2004"
+#define LSMDATE "07Oct04"
 
 /* Debug flags */
 #undef  DEBUG