Convert MySQL TinyBlob to BLOB for some Object table members

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index f7ef85775d96c2080d11fcd4c819c58a9d8df698..3c4f04e8170189c852b6c579e1e1fd3865ac1250 100644 (file)
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -163,12 +163,12 @@ CREATE TABLE Object
    PluginName   BLOB NOT NULL,
    FileIndex    integer  not null default 0,
 
-   ObjectCategory  TINYBLOB NOT NULL,
-   ObjectType   TINYBLOB     NOT NULL,
-   ObjectName   TINYBLOB     NOT NULL,
-   ObjectSource TINYBLOB     NOT NULL,
-   ObjectUUID   TINYBLOB     NOT NULL,
-   ObjectSize   bigint       NOT NULL,
+   ObjectCategory  BLOB NOT NULL,
+   ObjectType   BLOB     NOT NULL,
+   ObjectName   BLOB     NOT NULL,
+   ObjectSource BLOB     NOT NULL,
+   ObjectUUID   BLOB     NOT NULL,
+   ObjectSize   bigint   NOT NULL,
    ObjectStatus BINARY(1) NOT NULL DEFAULT 'U',
    ObjectCount  INTEGER UNSIGNED NOT NULL DEFAULT 1,
    primary key (ObjectId)

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 8482bc30661da213ee4f3183cdbdf6b3fd127574..d422d7a5469e19e630e219c7432b619b7d0fde55 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -710,7 +710,12 @@ ALTER TABLE Media
     MODIFY COLUMN UseWorm TINYINT DEFAULT 0;
 
 ALTER TABLE Object
-    ADD COLUMN FileIndex integer not null default 0;
+    ADD COLUMN FileIndex integer not null default 0,
+    MODIFY COLUMN ObjectSource BLOB,
+    MODIFY COLUMN ObjectName BLOB,
+    MODIFY COLUMN ObjectType BLOB;
+    MODIFY COLUMN ObjectCategory BLOB;
+    MODIFY COLUMN ObjectUUID BLOB;
 
 ALTER TABLE Job
     ADD COLUMN RealStartTime DATETIME,

diff --git a/bacula/updatedb/update_mysql_tables_1025_to_1026.in b/bacula/updatedb/update_mysql_tables_1025_to_1026.in
index f57efe61afffa3caadef04c02965fe514b0293b7..6ca606263983f8c2a9b74f9bfd5e1cdcf517f9fd 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1025_to_1026.in
+++ b/bacula/updatedb/update_mysql_tables_1025_to_1026.in
@@ -82,7 +82,12 @@ ALTER TABLE Media
     MODIFY COLUMN UseWorm TINYINT DEFAULT 0;
 
 ALTER TABLE Object
-    ADD COLUMN FileIndex integer not null default 0;
+    ADD COLUMN FileIndex integer not null default 0,
+    MODIFY COLUMN ObjectSource BLOB,
+    MODIFY COLUMN ObjectName BLOB,
+    MODIFY COLUMN ObjectType BLOB;
+    MODIFY COLUMN ObjectCategory BLOB;
+    MODIFY COLUMN ObjectUUID BLOB;
 
 ALTER TABLE Job
     ADD COLUMN RealStartTime DATETIME,