Fix Id type in MySQL make/update script

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 3f48b29568d91244201f5321ca64fc301d2f347c..bc27a4f001d32f126cc4bd2c025be4fd00cf6433 100644 (file)
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -64,17 +64,17 @@ CREATE TABLE Object
 (
    ObjectId     BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
 
-   JobId           integer  not null,
-   Path            BLOB NOT NULL,
-   Filename        BLOB NOT NULL,
-   PluginName      TINYBLOB NOT NULL,
+   JobId        INTEGER UNSIGNED  not null,
+   Path         BLOB NOT NULL,
+   Filename     BLOB NOT NULL,
+   PluginName   TINYBLOB NOT NULL,
 
    ObjectCategory  TINYBLOB NOT NULL,
-   ObjectType      TINYBLOB NOT NULL,
-   ObjectName      TINYBLOB NOT NULL,
-   ObjectSource    TINYBLOB NOT NULL,
-   ObjectUUID      TINYBLOB NOT NULL,
-   ObjectSize      bigint   NOT NULL,
+   ObjectType   TINYBLOB     NOT NULL,
+   ObjectName   TINYBLOB     NOT NULL,
+   ObjectSource TINYBLOB     NOT NULL,
+   ObjectUUID   TINYBLOB     NOT NULL,
+   ObjectSize   bigint       NOT NULL,
    primary key (ObjectId)
 );
 

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index d269037cfe79834da501e71b23c0b97d922a6c6a..ef8915a5c88fe45548bdfcdbbe762214c379b683 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -13,7 +13,6 @@ echo " "
 echo "This script will update a Bacula MySQL database"
 echo " from any from version 12-15 or 1014-$OLDVERSION to version $NEWVERSION"
 echo " which is needed to convert from any Bacula Enterprise"
-echo " version 4.0.x or later to version 12.6.x"
 echo " or Bacula Community versions 5.0.x, 5.2.x, 7.4.x, 9.x.x to"
 echo " Community version 11.2"
 echo " "
@@ -172,7 +171,7 @@ DROP INDEX JobId_2 on File;
 
 CREATE TABLE file_temp (
    FileId BIGINT UNSIGNED NOT NULL,
-   FileIndex INTEGER DEFAULT 0,
+   FileIndex INTEGER UNSIGNED DEFAULT 0,
    JobId INTEGER UNSIGNED NOT NULL,
    PathId INTEGER UNSIGNED NOT NULL,
    Filename BLOB NOT NULL,
@@ -222,7 +221,7 @@ DROP INDEX JobId_2 on File;
 
 CREATE TABLE file_temp (
    FileId BIGINT UNSIGNED NOT NULL,
-   FileIndex INTEGER DEFAULT 0,
+   FileIndex INTEGER UNSIGNED DEFAULT 0,
    JobId INTEGER UNSIGNED NOT NULL,
    PathId INTEGER UNSIGNED NOT NULL,
    Filename BLOB NOT NULL,