Fix MySQL update scripts for new MariaDB

diff --git a/bacula/updatedb/update_mysql_tables_10_to_11.in b/bacula/updatedb/update_mysql_tables_10_to_11.in
index 2d88322850ad25f04c99643bf02b846b5cfbe56f..305440eba1345250792c61afe7d5a0aa2ca1a61f 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_10_to_11.in
+++ b/bacula/updatedb/update_mysql_tables_10_to_11.in
@@ -38,7 +38,7 @@ CREATE TABLE JobHisto (
    Name TINYBLOB NOT NULL,
    Type BINARY(1) NOT NULL,
    Level BINARY(1) NOT NULL,
-   ClientId INTEGER DEFAULT 0,
+   ClientId INTEGER UNSIGNED DEFAULT 0,
    JobStatus BINARY(1) NOT NULL,
    SchedTime DATETIME DEFAULT 0,
    StartTime DATETIME DEFAULT 0,

diff --git a/bacula/updatedb/update_mysql_tables_5_to_6 b/bacula/updatedb/update_mysql_tables_5_to_6
index 9834228985a71956422d4cd51155bdd72ae979f2..06434c7e7aa59f271e62c96850fdf94af9976188 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_5_to_6
+++ b/bacula/updatedb/update_mysql_tables_5_to_6
@@ -61,17 +61,17 @@ DROP TABLE FileSet_backup;
 
 CREATE TABLE BaseFiles (
    BaseId INTEGER UNSIGNED AUTO_INCREMENT,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   FileId INTEGER UNSIGNED NOT NULL REFERENCES File,
+   JobId INTEGER UNSIGNED NOT NULL,
+   FileId INTEGER UNSIGNED NOT NULL,
    FileIndex INTEGER UNSIGNED,
    PRIMARY KEY(BaseId)
    );
 
 CREATE TABLE UnsavedFiles (
    UnsavedId INTEGER UNSIGNED AUTO_INCREMENT,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   PathId INTEGER UNSIGNED NOT NULL REFERENCES Path,
-   FilenameId INTEGER UNSIGNED NOT NULL REFERENCES Filename,
+   JobId INTEGER UNSIGNED NOT NULL,
+   PathId INTEGER UNSIGNED NOT NULL,
+   FilenameId INTEGER UNSIGNED NOT NULL,
    PRIMARY KEY (UnsavedId)
    );
 

diff --git a/bacula/updatedb/update_mysql_tables_6_to_7 b/bacula/updatedb/update_mysql_tables_6_to_7
index 6507d97ed5c4d1252a18697cdba339dd1de34da3..c2f416b385ba439fd35a26a37cec8966e7aa594e 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_6_to_7
+++ b/bacula/updatedb/update_mysql_tables_6_to_7
@@ -32,16 +32,16 @@ ALTER TABLE Media ADD COLUMN VolReadTime BIGINT UNSIGNED NOT NULL DEFAULT 0;
 ALTER TABLE Media ADD COLUMN VolWriteTime BIGINT UNSIGNED NOT NULL DEFAULT 0;
 
 ALTER TABLE Pool ADD COLUMN Enabled TINYINT DEFAULT 1;
-ALTER TABLE Pool ADD COLUMN ScratchPoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool;
-ALTER TABLE Pool ADD COLUMN RecyclePoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool;
+ALTER TABLE Pool ADD COLUMN ScratchPoolId INTEGER UNSIGNED DEFAULT 0;
+ALTER TABLE Pool ADD COLUMN RecyclePoolId INTEGER UNSIGNED DEFAULT 0;
 
 DROP TABLE BaseFiles;
 
 
 CREATE TABLE BaseFiles (
    BaseId INTEGER UNSIGNED AUTO_INCREMENT,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   FileId INTEGER UNSIGNED NOT NULL REFERENCES File,
+   JobId INTEGER UNSIGNED NOT NULL,
+   FileId INTEGER UNSIGNED NOT NULL,
    FileIndex INTEGER UNSIGNED,
    PRIMARY KEY(BaseId)
    );
@@ -50,9 +50,9 @@ DROP TABLE UnsavedFiles;
 
 CREATE TABLE UnsavedFiles (
    UnsavedId INTEGER UNSIGNED AUTO_INCREMENT,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   PathId INTEGER UNSIGNED NOT NULL REFERENCES Path,
-   FilenameId INTEGER UNSIGNED NOT NULL REFERENCES Filename,
+   JobId INTEGER UNSIGNED NOT NULL,
+   PathId INTEGER UNSIGNED NOT NULL,
+   FilenameId INTEGER UNSIGNED NOT NULL,
    PRIMARY KEY (UnsavedId)
    );
 
@@ -60,9 +60,9 @@ DROP TABLE BaseFiles;
 
 CREATE TABLE BaseFiles (
    BaseId INTEGER UNSIGNED AUTO_INCREMENT,
-   BaseJobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   FileId INTEGER UNSIGNED NOT NULL REFERENCES File,
+   BaseJobId INTEGER UNSIGNED NOT NULL,
+   JobId INTEGER UNSIGNED NOT NULL,
+   FileId INTEGER UNSIGNED NOT NULL,
    FileIndex INTEGER UNSIGNED,
    PRIMARY KEY(BaseId)
    );

diff --git a/bacula/updatedb/update_mysql_tables_8_to_9 b/bacula/updatedb/update_mysql_tables_8_to_9
index f43f2598ec79dcac71d40308f129923b673d540d..56ceff9f35b6d849b6be3080150928b0b3e52c37 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_8_to_9
+++ b/bacula/updatedb/update_mysql_tables_8_to_9
@@ -13,11 +13,11 @@ if $bindir/mysql $* -f <<END-OF-DATA
 USE bacula;
 
 ALTER TABLE Media ADD COLUMN LabelType INTEGER UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE Media ADD COLUMN StorageId INTEGER UNSIGNED DEFAULT 0 REFERENCES Storage;
+ALTER TABLE Media ADD COLUMN StorageId INTEGER UNSIGNED DEFAULT 0;
 ALTER TABLE Media ADD COLUMN VolParts INTEGER UNSIGNED NOT NULL DEFAULT 0;
 
 ALTER TABLE Pool  ADD COLUMN LabelType INTEGER UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE Pool  ADD COLUMN NextPoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool;
+ALTER TABLE Pool  ADD COLUMN NextPoolId INTEGER UNSIGNED DEFAULT 0;
 ALTER TABLE Pool  ADD COLUMN MigrationHighBytes BIGINT UNSIGNED DEFAULT 0;
 ALTER TABLE Pool  ADD COLUMN MigrationLowBytes BIGINT UNSIGNED DEFAULT 0;
 ALTER TABLE Pool  ADD COLUMN MigrationTime BIGINT UNSIGNED DEFAULT 0;
@@ -43,8 +43,8 @@ CREATE TABLE Storage (
 CREATE TABLE Device (
    DeviceId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
    Name VARCHAR(128) NOT NULL,
-   MediaTypeId INTEGER UNSIGNED NOT NULL REFERENCES MediaType,
-   StorageId INTEGER UNSIGNED REFERENCES Storage,
+   MediaTypeId INTEGER UNSIGNED NOT NULL,
+   StorageId INTEGER UNSIGNED,
    DevMounts INTEGER UNSIGNED DEFAULT 0,
    DevReadBytes BIGINT UNSIGNED DEFAULT 0,
    DevWriteBytes BIGINT UNSIGNED DEFAULT 0,

diff --git a/bacula/updatedb/update_mysql_tables_9_to_10.in b/bacula/updatedb/update_mysql_tables_9_to_10.in
index 4e0eec4561962c343982306df41844beaf05a68d..461fd9edb898d42cff858228c11586688a34828b 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_9_to_10.in
+++ b/bacula/updatedb/update_mysql_tables_9_to_10.in
@@ -25,7 +25,7 @@ DROP TABLE IF EXISTS LocationLog;
 
 CREATE TABLE Log (
    LogId INTEGER UNSIGNED AUTO_INCREMENT,
-   JobId INTEGER UNSIGNED DEFAULT 0 REFERENCES Job,
+   JobId INTEGER UNSIGNED DEFAULT 0,
    Time DATETIME DEFAULT 0,
    LogText BLOB NOT NULL,
    PRIMARY KEY(LogId),
@@ -44,27 +44,27 @@ CREATE TABLE LocationLog (
    LocLogId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
    Date DATETIME DEFAULT 0,
    Comment BLOB,
-   MediaId INTEGER UNSIGNED DEFAULT 0 REFERENCES Media,
-   LocationId INTEGER UNSIGNED DEFAULT 0 REFERENCES Location,
+   MediaId INTEGER UNSIGNED DEFAULT 0,
+   LocationId INTEGER UNSIGNED DEFAULT 0,
    NewVolStatus ENUM('Full', 'Archive', 'Append', 'Recycle', 'Purged',
     'Read-Only', 'Disabled', 'Error', 'Busy', 'Used', 'Cleaning') NOT NULL,
    NewEnabled TINYINT,
    PRIMARY KEY(LocLogId)
 );
 
-ALTER TABLE Media ADD COLUMN MediaTypeId INTEGER UNSIGNED DEFAULT 0 REFERENCES MediaType;
-ALTER TABLE Media ADD COLUMN DeviceId INTEGER UNSIGNED DEFAULT 0 REFERENCES Device;
-ALTER TABLE Media ADD COLUMN LocationId INTEGER UNSIGNED DEFAULT 0 REFERENCES Location;
+ALTER TABLE Media ADD COLUMN MediaTypeId INTEGER UNSIGNED DEFAULT 0;
+ALTER TABLE Media ADD COLUMN DeviceId INTEGER UNSIGNED DEFAULT 0;
+ALTER TABLE Media ADD COLUMN LocationId INTEGER UNSIGNED DEFAULT 0;
 ALTER TABLE Media ADD COLUMN RecycleCount INTEGER UNSIGNED DEFAULT 0;
 ALTER TABLE Media ADD COLUMN InitialWrite DATETIME DEFAULT 0;
-ALTER TABLE Media ADD COLUMN ScratchPoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool;
-ALTER TABLE Media ADD COLUMN RecyclePoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool;
+ALTER TABLE Media ADD COLUMN ScratchPoolId INTEGER UNSIGNED DEFAULT 0;
+ALTER TABLE Media ADD COLUMN RecyclePoolId INTEGER UNSIGNED DEFAULT 0;
 ALTER TABLE Media ADD COLUMN Enabled TINYINT DEFAULT 1;
 ALTER TABLE Media ADD COLUMN Comment BLOB;
 
 ALTER TABLE JobMedia DROP COLUMN Stripe;
 
-ALTER TABLE Job ADD COLUMN PriorJobId INTEGER UNSIGNED DEFAULT 0 REFERENCES Job;
+ALTER TABLE Job ADD COLUMN PriorJobId INTEGER UNSIGNED DEFAULT 0;
 ALTER TABLE Job ADD COLUMN RealEndTime DATETIME DEFAULT 0;