Add dummy PKEY to new MySQL tables

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 3b484109b78a14f939e9a38ace7dd4308605f441..0b39f96dc607e42a6d1e2acb5bd3c8afcf849258 100644 (file)
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -36,9 +36,10 @@ USE ${db_name};
 
 CREATE TABLE MetaEmail
 (
-    EmailTenant                TINYBLOB,
-    EmailOwner                 TINYBLOB,
-    EmailId                    TINYBLOB,
+    EmailPKId  BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication
+    EmailTenant                TINYTEXT,
+    EmailOwner                 TINYTEXT,
+    EmailId                    TINYTEXT,
     EmailTime                  DATETIME,
     EmailTags                  BLOB,
     EmailSubject               BLOB,
@@ -75,9 +76,12 @@ CREATE INDEX meta_emailfileindex_jobid on MetaEmail (Jobid, FileIndex);
 
 CREATE TABLE MetaAttachment
 {
-    AttachmentName                     BLOB,
-    AttachmentEmailId                  TINYBLOB,
-    AttachmentContentType      TINYBLOB,
+    AttachmentPKId  BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication
+    AttachmentTenant            TINYTEXT,
+    AttachmentOwner                    TINYTEXT,
+    AttachmentName                     TEXT,
+    AttachmentEmailId                  TINYTEXT,
+    AttachmentContentType      TINYTEXT,
     AttachmentIsInline                 SMALLINT,
     AttachmentSize                     INTEGER,
     Plugin                             TINYBLOB,

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 56a08f6945a0cb82ed30603296e1d0ba83e488c7..82c3456e48d49a8d1d205afb9714a8f90e04a59f 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -567,6 +567,7 @@ USE ${db_name};
 
 CREATE TABLE MetaEmail
 (
+    EmailPKId  BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication
     EmailTenant                TINYTEXT,
     EmailOwner                 TINYTEXT,
     EmailId                    TINYTEXT,
@@ -604,6 +605,7 @@ CREATE INDEX meta_emailjobid on MetaEmail (Jobid);
 
 CREATE TABLE MetaAttachment
 {
+    AttachmentPKId  BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication
     AttachmentTenant            TINYTEXT,
     AttachmentOwner                    TINYTEXT,
     AttachmentName                     TEXT,

diff --git a/bacula/updatedb/update_mysql_tables_1024_to_1025.in b/bacula/updatedb/update_mysql_tables_1024_to_1025.in
index f3392043cca698ba33f15a62b0e591a03a56fda6..8c30a2ec2d9c9116101581c61681751f32f26936 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1024_to_1025.in
+++ b/bacula/updatedb/update_mysql_tables_1024_to_1025.in
@@ -30,6 +30,7 @@ USE ${db_name};
 
 CREATE TABLE MetaEmail
 (
+    EmailPKId  BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication
     EmailTenant                TINYTEXT,
     EmailOwner                 TINYTEXT,
     EmailId                    TINYTEXT,
@@ -67,6 +68,7 @@ CREATE INDEX meta_emailjobid on MetaEmail (Jobid);
 
 CREATE TABLE MetaAttachment
 {
+    AttachmentPKId  BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication
     AttachmentTenant            TINYTEXT,
     AttachmentOwner                    TINYTEXT,
     AttachmentName                     TEXT,