Merge branch 'bareos-15.2'

bareos · Dec 26, 2015 · 0f50460 · 0f50460
2 parents 4aa630a + c9297d7
commit 0f50460
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/tests/bbatch.c b/src/tests/bbatch.c
@@ -42,6 +42,7 @@
  */
 
 #include "bareos.h"
+#include "jcr.h"
 #include "stored/stored.h"
 #include "findlib/find.h"
 #include "cats/cats.h"

diff --git a/src/tests/bvfs_test.c b/src/tests/bvfs_test.c
@@ -25,6 +25,7 @@
  */
 
 #include "bareos.h"
+#include "jcr.h"
 #include "cats/cats.h"
 #include "cats/sql_glue.h"
 #include "cats/bvfs.h"

diff --git a/src/tests/cats_test.c b/src/tests/cats_test.c
@@ -24,6 +24,7 @@
 #define _BDB_PRIV_INTERFACE_
 
 #include "bareos.h"
+#include "jcr.h"
 #include "cats/cats.h"
 #include "cats/bdb_priv.h"
 #include "cats/sql_glue.h"

diff --git a/src/tests/testls.c b/src/tests/testls.c
@@ -27,6 +27,7 @@
  */
 
 #include "bareos.h"
+#include "jcr.h"
 #include "findlib/find.h"
 #include "filed/fd_plugins.h"
 
@@ -275,5 +276,3 @@ static void print_ls_output(char *fname, char *link, int type, struct stat *stat
    *p = 0;
    fputs(buf, stdout);
 }
-
-bool python_set_prog(JCR*, char const*) { return false; }
diff --git a/src/win32/plugins/filed/mssqlvdi-fd.c b/src/win32/plugins/filed/mssqlvdi-fd.c
@@ -1173,7 +1173,7 @@ static inline void perform_ado_backup(bpContext *ctx)
    switch (p_ctx->backup_level) {
    case L_INCREMENTAL:
       Mmsg(ado_query,
-           "BACKUP LOG %s TO VIRTUAL_DEVICE='%s' WITH BLOCKSIZE=%d, BUFFERCOUNT=%d, MAXTRANSFERSIZE=%d",
+           "BACKUP LOG [%s] TO VIRTUAL_DEVICE='%s' WITH BLOCKSIZE=%d, BUFFERCOUNT=%d, MAXTRANSFERSIZE=%d",
            p_ctx->database,
            vdsname,
            DEFAULT_BLOCKSIZE,
@@ -1232,7 +1232,7 @@ static inline void perform_ado_restore(bpContext *ctx)
    switch (p_ctx->backup_level) {
    case L_INCREMENTAL:
       Mmsg(ado_query,
-           "RESTORE LOG %s FROM VIRTUAL_DEVICE='%s' WITH BLOCKSIZE=%d, BUFFERCOUNT=%d, MAXTRANSFERSIZE=%d, %s",
+           "RESTORE LOG [%s] FROM VIRTUAL_DEVICE='%s' WITH BLOCKSIZE=%d, BUFFERCOUNT=%d, MAXTRANSFERSIZE=%d, %s",
            p_ctx->database,
            vdsname,
            DEFAULT_BLOCKSIZE,