More read multijob record fixes

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

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 09079128b1a315034aaa8cfd27eb3fbd36eae6ea..84a848d058f318accc1ba2c3fe8b4318e0dea44e 100644 (file)
--- 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 9c39b0391fd468c2def6e0170db5e5a899fd621f..fd1b8b68c535b82c8474d6a165fcaf2f94aae772 100644 (file)
--- 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 aa12351914a0ac45850d100c7abbc152b87f6495..5f1c7f27184b105be079fa1fafa2cee9cbcb16b7 100644 (file)
--- 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 9ada74bda1267d07944b79df1049535ef18d19e7..34dd68c6e8871e33679053587ba9cd79614219f3 100644 (file)
--- 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;
    }