From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 4 Sep 2007 10:04:42 +0000 (+0000)
Subject: Apply trunk fixes update technotes
X-Git-Tag: Release-2.2.2~1^2^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=27be46d41e6ed35a4ae2b5fdaccfe425b257a1cc;p=bacula%2Fbacula

Apply trunk fixes update technotes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2.1@5450 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 29bdd02d68..48a2661c10 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,6 +1,12 @@
               Technical notes on version 2.2.x
 
 General:
+Release Version 2.2.2
+04Sep07
+ebl  Detect if new PosgreSQL batch insert API is present.
+kes  Correct incorrect mempool call causing Director crash.
+sb   Update spec files for 2.2.1 release
+
 Release Version 2.2.1
 30Aug07
 kes  Update POTFILES.in
diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index aa4e49f319..f8247782b2 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,5 +1,5 @@
 
-          Release Notes for Bacula 2.2.1 
+          Release Notes for Bacula 2.2.2 
 
   Bacula code: Total files = 520 Total lines = 195,550 (*.h *.c *.in)
   82 new files, 41,221 new lines of code, 208,380 lines of change from 2.0.3
@@ -10,6 +10,11 @@ use some of the new features that affect the FD.  In other words, you should
 not have to upgrade all your File daemons when you upgrade. There is
 no database upgrade needed from version 2.0.x to 2.2.0.
 
+Version 2.2.2 is a bug fix release to 2.2.1
+- Detect if new PosgreSQL batch insert API is present.
+- Correct incorrect mempool call causing Director crash.
+- Update spec files for 2.2.1 release
+
 Version 2.2.1 is mainly a minor bug fix release to version 2.2.0,
   the main changes since 2.2.0 are:
 - Fixed bugs #921, 930, and 923.
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index c1a29bfd99..e5f4363b2a 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1332,7 +1332,16 @@ if test $pkg = 0; then
        support_batch_insert=yes
      fi])
 fi
-							  
+	
+# Check if postgresql support batch mode	
+if test x$DB_TYPE = xpostgresql; then
+   A=`nm $SQL_LIB | grep PQputCopyData`
+   pkg=$?
+   if test $pkg != 0; then
+      support_batch_insert=no
+   fi
+fi
+
 if test $support_batch_insert = yes ; then
    AC_DEFINE(HAVE_BATCH_FILE_INSERT, 1, [Set if DB batch insert code enabled])
 fi
diff --git a/bacula/configure b/bacula/configure
index c23bc09563..55e04da51d 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -17503,6 +17503,15 @@ if test "${enable_batch_insert+set}" = set; then
 fi;
 fi
 
+# Check if postgresql support batch mode
+if test x$DB_TYPE = xpostgresql; then
+   A=`nm $SQL_LIB | grep PQputCopyData`
+   pkg=$?
+   if test $pkg != 0; then
+      support_batch_insert=no
+   fi
+fi
+
 if test $support_batch_insert = yes ; then
 
 cat >>confdefs.h <<\_ACEOF
diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index ab33393a19..299847fee3 100644
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -769,7 +769,7 @@ void bmsg(UAContext *ua, const char *fmt, va_list arg_ptr)
       msg = bs->msg;
    }
    if (!msg) {
-      msg = get_pool_memory(5000);
+      msg = get_memory(5000);
    }
 
    maxlen = sizeof_pool_memory(msg) - 1;
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 67388ea7a6..8384955716 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.2.1"
-#define BDATE   "30 August 2007"
-#define LSMDATE "30Aug07"
+#define VERSION "2.2.2"
+#define BDATE   "04 September 2007"
+#define LSMDATE "04Aug07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 00d106eee6..06482fb244 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,12 @@
-              Technical notes on version 2.3
+              Technical notes on version 2.2
 
 General:
+Release Version 2.2.2
+04Sep07
+ebl  Detect if new PosgreSQL batch insert API is present.
+kes  Correct incorrect mempool call causing Director crash.
+sb   Update spec files for 2.2.1 release
+
 Release Version 2.2.1
 30Aug07
 kes  Update POTFILES.in