From 2a40fdd1089726dfc75a77dc46aa36b8b841fd05 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 25 Jan 2009 13:23:28 +0000
Subject: [PATCH] kes  Turn off db_get_file_list() giant SQL because if fails
 on      my production machine. kes  Fix bat.pro.in so that bat is properly
 installed rather      than just copied.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8401 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/sql_get.c        | 6 +++++-
 bacula/src/qt-console/bat.pro.in | 2 +-
 bacula/src/version.h             | 6 +++---
 bacula/technotes-2.5             | 5 +++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 31794f4900..9907139d24 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -1060,7 +1060,11 @@ bool db_get_file_list(JCR *jcr, B_DB *mdb, char *jobids,
    }
    POOL_MEM buf(PM_MESSAGE);
          
-#define new_db_get_file_list
+/* 
+ * Note! Turned off by KES 25Jan09 because this SELECT fails
+ *   on my system.  Failure message sent to Eric.
+ */
+//#define new_db_get_file_list
 #ifdef new_db_get_file_list
    /* This is broken, at least if called from ua_restore.c */
    Mmsg(buf,
diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index 607ae93e4c..5c94b04813 100644
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -22,7 +22,7 @@ LIBS        += -L../lib -lbaccfg -lbac @OPENSSL_LIBS@
 LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
 LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
 QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
-QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} $(COPY_PROGRAM)
+QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m 0754 -p
 QMAKE_CLEAN += .libs/bat 
 
 qwt {
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4f7df67590..a2433b5cee 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.5.30"
-#define BDATE   "24 January 2009"
-#define LSMDATE "24Jan09"
+#define VERSION "2.5.31"
+#define BDATE   "25 January 2009"
+#define LSMDATE "25Jan09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 3ecd8e50fd..63aecf50d3 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,11 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+25Jan09
+kes  Turn off db_get_file_list() giant SQL because if fails on
+     my production machine.
+kes  Fix bat.pro.in so that bat is properly installed rather
+     than just copied.
 24Jan09
 kes  Modify search for .conf file so that if one is given on
      the command line, it will be used, otherwise it will use
-- 
2.39.5