From cab3bb590fdc567b9d8133580ceb2307119fe4eb Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 26 Aug 2002 15:44:44 +0000
Subject: [PATCH] More read multijob record fixes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@123 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/sql.c       | 4 ++--
 bacula/src/stored/acquire.c | 2 +-
 bacula/src/stored/bls.c     | 1 +
 bacula/src/stored/record.c  | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 09079128b1..84a848d058 100644
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -226,7 +226,7 @@ void _db_unlock(char *file, int line, B_DB *mdb)
  */
 void db_start_transaction(B_DB *mdb)
 {
-#ifdef HAVE_SQLITE
+#ifdef xAVE_SQLITE
    db_lock(mdb);
    /* Allow only 10,000 changes per transaction */
    if (mdb->transaction && mdb->changes > 10000) {
@@ -244,7 +244,7 @@ void db_start_transaction(B_DB *mdb)
 
 void db_end_transaction(B_DB *mdb)
 {
-#ifdef HAVE_SQLITE
+#ifdef xAVE_SQLITE
    db_lock(mdb);
    if (mdb->transaction) {
       my_sqlite_query(mdb, "COMMIT"); /* end transaction */
diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 9c39b0391f..fd1b8b68c5 100644
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -138,7 +138,7 @@ int acquire_device_for_append(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
 
    dev->num_writers++;
    if (dev->num_writers > 1) {
-      Dmsg2(0, "Hey!!!! There are %d writers on device %s\n", dev->num_writers,
+      Dmsg2(100, "Hey!!!! There are %d writers on device %s\n", dev->num_writers,
 	 dev_name(dev));
    }
    if (jcr->NumVolumes == 0) {
diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index aa12351914..5f1c7f2718 100644
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -513,6 +513,7 @@ Warning, this Volume is a continuation of Volume %s\n",
 	 if (!read_record_from_block(block, rec)) {
             Dmsg3(10, "!read-break. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
 		  block->BlockNumber, rec->remainder);
+//	    rec->remainder = 0;
 	    break;
 	 }
          Dmsg3(10, "read-OK. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
diff --git a/bacula/src/stored/record.c b/bacula/src/stored/record.c
index 9ada74bda1..34dd68c6e8 100644
--- a/bacula/src/stored/record.c
+++ b/bacula/src/stored/record.c
@@ -373,10 +373,12 @@ remlen=%d data_len=%d\n",
        * then reread.
        */
       Dmsg0(90, "read_record_block: nothing\n");
+#ifdef xxx
       if (!rec->remainder) {
 	 rec->remainder = 1;	      /* set to expect continuation */
 	 rec->data_len = 0;	      /* no data transferred */
       }
+#endif
       rec->state |= (REC_NO_HEADER | REC_BLOCK_EMPTY);
       return 0;
    }
-- 
2.39.5