catalog: small MySQL tweaks for RestoreObject and Object tables

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 6c70044049c56e1f17cb6b9ab685fcfaa94fb824..176ae7fae239c1d0980ef65d1af821a4a848bac5 100644 (file)
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -128,7 +128,7 @@ CREATE TABLE Object
    JobId        INTEGER UNSIGNED NOT NULL,
    Path         BLOB NOT NULL,
    Filename     BLOB NOT NULL,
-   PluginName   TINYBLOB NOT NULL,
+   PluginName   BLOB NOT NULL,
 
    ObjectCategory  TINYBLOB NOT NULL,
    ObjectType   TINYBLOB     NOT NULL,
@@ -200,9 +200,9 @@ CREATE TABLE File (
 
 CREATE TABLE RestoreObject (
    RestoreObjectId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
-   ObjectName BLOB NOT NULL,
+   ObjectName MEDIUMBLOB NOT NULL,
    RestoreObject LONGBLOB NOT NULL,
-   PluginName TINYBLOB NOT NULL,
+   PluginName BLOB NOT NULL,
    ObjectLength INTEGER DEFAULT 0,
    ObjectFullLength INTEGER DEFAULT 0,
    ObjectIndex INTEGER DEFAULT 0,

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index e29e4e01168401aadcf863a84f0a68a73307134f..59a292f033980d7d406149525ccbdad26402abfa 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -634,6 +634,10 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('q', 'Queued waiting for device',15),
    ('W', 'Terminated normally with warnings',25);
 
+ALTER TABLE RestoreObject MODIFY ObjectName MEDIUMBLOB;
+ALTER TABLE RestoreObject MODIFY PluginName BLOB;
+ALTER TABLE Object MODIFY PluginName BLOB;
+
 UPDATE Version SET VersionId=1025;
 END-OF-DATA
     then

diff --git a/bacula/updatedb/update_mysql_tables_1024_to_1025.in b/bacula/updatedb/update_mysql_tables_1024_to_1025.in
index f5eb53d7f6a4d3ea8a19da82d705c42c90849eb5..293f68106a540681ffc0fc2b974d3f7c57269b9b 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1024_to_1025.in
+++ b/bacula/updatedb/update_mysql_tables_1024_to_1025.in
@@ -97,6 +97,10 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('q', 'Queued waiting for device',15),
    ('W', 'Terminated normally with warnings',25);
 
+ALTER TABLE RestoreObject MODIFY ObjectName MEDIUMBLOB;
+ALTER TABLE RestoreObject MODIFY PluginName BLOB;
+ALTER TABLE Object MODIFY PluginName BLOB;
+
 UPDATE Version SET VersionId=1025;
 END-OF-DATA
 then