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 29bdd02d68db36ea555165dcdfb27244951916f7..48a2661c10638125d8f70573c4a51cc099509ec7 100644 (file)
--- 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 aa4e49f3197f8bf87b81dd374d25ceb4122cdc3c..f8247782b2763642df1b45137d9d3a1fe6bb5e7c 100644 (file)
--- 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 c1a29bfd99c0ec434dc57782bbfb0740916baf1e..e5f4363b2a0e79a99a3e8ab52bd525271a630bbe 100644 (file)
--- 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 c23bc0956309feb3231a4d7d301518b65c736be0..55e04da51d326802256fd0382358bc0c978c0c1e 100755 (executable)
--- 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 ab33393a1971787160b106d3ff3e0576ae1d8581..299847fee37668352c911861533133c77909eb8e 100644 (file)
--- 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 67388ea7a6d2d292ab5718d2048bffd83a05e4be..83849557162399a6e096de14e53a601ff69082ff 100644 (file)
--- 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 00d106eee68990ae78b04819f86b7b06f4d158b6..06482fb24475e926897c9e7e98bafece5bc2ef2b 100644 (file)
--- 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