From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 26 Nov 2021 17:27:27 +0000 (+0100)
Subject: Add dummy PKEY to new MySQL tables
X-Git-Tag: Beta-15.0.0~752
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee1d7c165f15784f2a991cf641a0e32ecc283c0;p=thirdparty%2Fbacula.git

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 3b484109b..0b39f96dc 100644
--- 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 56a08f694..82c3456e4 100644
--- 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 f3392043c..8c30a2ec2 100644
--- 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,