Fix #1624 about segfault in dvd driver when calling rewind(NULL)

[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 4a159a9578dd60f2b41dfa34a7a4ddf13c459b62..a3bc72506decf22c0b3d3300ecd3dec2b91e439d 100755 (executable)
--- a/bacula/src/cats/make_ingres_tables.in
+++ b/bacula/src/cats/make_ingres_tables.in
@@ -9,6 +9,15 @@ 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
@@ -79,6 +88,7 @@ CREATE INDEX file_jobid_idx ON File(jobid);
 CREATE SEQUENCE RestoreObject_Seq;
 CREATE TABLE RestoreObject (
    RestoreObjectId     INTEGER         NOT NULL DEFAULT RestoreObject_Seq.nextval,
+   ObjectName          VARBYTE(128)    NOT NULL,
    RestoreObject       BLOB            NOT NULL,
    PluginName          VARBYTE(128)    NOT NULL,
    ObjectLength        INTEGER         DEFAULT 0,
@@ -481,7 +491,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