Split messages line by line before sending it to syslog() fix #3325

[bacula/bacula] / bacula / src / cats / make_ingres_tables.in

diff --git a/bacula/src/cats/make_ingres_tables.in b/bacula/src/cats/make_ingres_tables.in
index 2dc8c162ae58df04fe024a61c52a5a27fde73fd1..ecd518feed7a5bd0f486d4941ebd956efbe68643 100755 (executable)
--- a/bacula/src/cats/make_ingres_tables.in
+++ b/bacula/src/cats/make_ingres_tables.in
@@ -2,13 +2,22 @@
 #
 # shell script to create Bacula Ingres tables
 #
-bindir=@SQL_BINDIR@
+bindir=@INGRES_BINDIR@
 PATH="$bindir:$PATH"
 db_name=${db_name:-@db_name@}
 db_user=${db_user:-@db_user@}
 
 sql -u${db_user} $* ${db_name} <<END-OF-DATA
 
+--
+-- When using batch insert make sure you adhere to the following
+-- minimum Ingres version:
+--
+-- Ingres 9.2 or higher with the fix for bug 123652 and bug 117256
+--   For Solaris x86 this is Ingres 9.2. + patch 13785 or higher
+--   For Linux x86_64 this is Ingres 9.2 + patch 13790 or higher
+--
+
 --
 -- As it seems the upper limit for a VARCHAR/VARBYTE column is 32000 bytes
 -- We could have used a BLOB as storage type which can go up to 2 Gb but
@@ -63,6 +72,7 @@ CREATE TABLE file
    JobId               INTEGER         NOT NULL,
    PathId              INTEGER         NOT NULL,
    FilenameId          INTEGER         NOT NULL,
+   DeltaSeq            INTEGER         NOT NULL DEFAULT 0,
    MarkId              INTEGER         NOT NULL DEFAULT 0,
    LStat               VARBYTE(255)    NOT NULL,
    Md5                 VARBYTE(255)    NOT NULL,
@@ -482,7 +492,7 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('i', 'Doing batch insert file records',15);
 
-INSERT INTO Version (VersionId) VALUES (12);
+INSERT INTO Version (VersionId) VALUES (@BDB_VERSION@);
 
 -- Make sure we have appropriate permissions
 \g