Fix org#2577 Remove -f option from MySQL update scripts to detect errors properly

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 7f2ab86985d7d14a03e4c6eac6a0033d7090affd..d4bb96daee1db8fa00c6b63677cc0454b90e8b43 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -65,12 +65,12 @@ fi
 
 # For all versions, we need to create the Index on Media(StorageId)
 # It may fail, but it's not a big problem
-# mysql $* -f <<END-OF-DATA >/dev/null 2> /dev/null
+# mysql $*  <<END-OF-DATA >/dev/null 2> /dev/null
 # CREATE INDEX media_storageid_idx ON Media (StorageId);
 # END-OF-DATA
 
 if [ "$DBVERSION" -eq 12 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 CREATE TABLE RestoreObject (
@@ -103,7 +103,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 13 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 ALTER TABLE File ADD COLUMN DeltaSeq smallint default 0;
@@ -120,7 +120,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 14 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
@@ -137,7 +137,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1014 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 ALTER TABLE Media
@@ -293,7 +293,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1016 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 CREATE INDEX jobtdate_idx on JobHisto (JobTDate);
 ALTER TABLE Snapshot ADD COLUMN JobId INTEGER UNSIGNED DEFAULT 0;
@@ -310,7 +310,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1017 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 CREATE TABLE FileMedia
 (
@@ -335,7 +335,7 @@ fi
 
 # We are coming from version 16, so it's already done
 if [ "$SKIP1018" = 1 -a "$DBVERSION" -eq 1018 ]; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE File MODIFY FileIndex INTEGER DEFAULT 0;
 ALTER TABLE RestoreObject MODIFY FileIndex INTEGER DEFAULT 0;
@@ -352,7 +352,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1018 ] ; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE BaseFiles MODIFY COLUMN BaseId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT;
 ALTER TABLE Media 
@@ -396,7 +396,7 @@ fi
 
 
 if [ "$DBVERSION" -eq 1019 ] ; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE Pool ADD COLUMN MaxPoolBytes BIGINT UNSIGNED DEFAULT 0;
 ALTER TABLE Job ADD COLUMN PriorJob TINYBLOB;
@@ -413,7 +413,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1020 ] ; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE File
    MODIFY FileIndex INTEGER DEFAULT 0;
@@ -433,7 +433,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1021 ] ; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 
 CREATE TABLE TagJob
@@ -512,7 +512,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1022 ] ; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE FileMedia ADD FileMediaId integer auto_increment primary key;
 ALTER TABLE JobHisto MODIFY COLUMN JobId int PRIMARY KEY AUTO_INCREMENT;
@@ -540,7 +540,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 1023 ] ; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE Object
     ADD ObjectStatus BINARY(1) DEFAULT 'U',

diff --git a/bacula/updatedb/update_mysql_tables.in b/bacula/updatedb/update_mysql_tables.in
index 1f6eec5449ab391d26788564acdad9e349153f5b..0a569da4aca3bfc1196ec56ca1e1dbb0371b7ffb 100644 (file)
--- a/bacula/updatedb/update_mysql_tables.in
+++ b/bacula/updatedb/update_mysql_tables.in
@@ -46,12 +46,12 @@ fi
 
 # For all versions, we need to create the Index on Media(StorageId)
 # It may fail, but it's not a big problem
-# mysql $* -f <<END-OF-DATA >/dev/null 2> /dev/null
+# mysql $*  <<END-OF-DATA >/dev/null 2> /dev/null
 # CREATE INDEX media_storageid_idx ON Media (StorageId);
 # END-OF-DATA
 
 if [ "$DBVERSION" -eq 12 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 CREATE TABLE RestoreObject (
@@ -84,7 +84,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 13 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 ALTER TABLE File ADD COLUMN DeltaSeq smallint default 0;
@@ -101,7 +101,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 14 ] ; then
-    if mysql $* -f <<END-OF-DATA
+    if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
@@ -144,7 +144,7 @@ END-OF-DATA
 fi
 
 if [ "$DBVERSION" -eq 15 ] ; then
-    if mysql $* -f  <<END-OF-DATA
+    if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE BaseFiles MODIFY COLUMN BaseId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT;
 ALTER TABLE Media CHANGE COLUMN VolParts VolType INTEGER UNSIGNED DEFAULT 0;

diff --git a/bacula/updatedb/update_mysql_tables_1020_to_1021.in b/bacula/updatedb/update_mysql_tables_1020_to_1021.in
index 3794537b8e26ddcf09206891276f63056271108e..15fe3a8b2b85b21278351cc42d5898c16dca9760 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1020_to_1021.in
+++ b/bacula/updatedb/update_mysql_tables_1020_to_1021.in
@@ -24,7 +24,7 @@ if [ $DBVERSION != 1020 ] ; then
    exit 1
 fi
 
-if mysql $* -f <<END-OF-DATA
+if mysql $*  <<END-OF-DATA
 USE ${db_name};
 UPDATE Version SET VersionId=1021;
 ALTER TABLE File

diff --git a/bacula/updatedb/update_mysql_tables_1021_to_1022.in b/bacula/updatedb/update_mysql_tables_1021_to_1022.in
index df0956b266bdb4b9d33b51821ae1cd90bfcd2661..29722e4f6c2c096c6916e49ca0d6546012ee9c80 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1021_to_1022.in
+++ b/bacula/updatedb/update_mysql_tables_1021_to_1022.in
@@ -23,7 +23,7 @@ if [ $DBVERSION != 1021 ] ; then
    exit 1
 fi
 
-if mysql $* -f <<END-OF-DATA
+if mysql $*  <<END-OF-DATA
 USE ${db_name};
 CREATE TABLE TagJob
 (

diff --git a/bacula/updatedb/update_mysql_tables_1022_to_1023.in b/bacula/updatedb/update_mysql_tables_1022_to_1023.in
index 1b625e9bdae7bf2072303edab59b6b97327c513e..6005b5d852077b68ee6e0bd283562eac8e33a2f5 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1022_to_1023.in
+++ b/bacula/updatedb/update_mysql_tables_1022_to_1023.in
@@ -23,7 +23,7 @@ if [ $DBVERSION != 1022 ] ; then
    exit 1
 fi
 
-if mysql $* -f <<END-OF-DATA
+if mysql $*  <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE FileMedia ADD FileMediaId integer auto_increment primary key;
 ALTER TABLE JobHisto MODIFY COLUMN JobId int PRIMARY KEY AUTO_INCREMENT;

diff --git a/bacula/updatedb/update_mysql_tables_1023_to_1024.in b/bacula/updatedb/update_mysql_tables_1023_to_1024.in
index 195a634968523c5069626823e6a3cbd3db225262..57330a24899d4b43ea9d1e36038ecf9926a40708 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1023_to_1024.in
+++ b/bacula/updatedb/update_mysql_tables_1023_to_1024.in
@@ -23,7 +23,7 @@ if [ $DBVERSION != 1023 ] ; then
    exit 1
 fi
 
-if mysql $* -f  <<END-OF-DATA
+if mysql $*   <<END-OF-DATA
 USE ${db_name};
 ALTER TABLE Object ADD ObjectStatus BINARY(1) DEFAULT 'U';
 ALTER TABLE Object ADD ObjectCount  INTEGER UNSIGNED DEFAULT 1;

diff --git a/bacula/updatedb/update_mysql_tables_10_to_11.in b/bacula/updatedb/update_mysql_tables_10_to_11.in
index 7967058172031fbd303a41f38e26fbe9d60fdf89..2df12f82b35886051e844b8321275cf47eb47fd7 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_10_to_11.in
+++ b/bacula/updatedb/update_mysql_tables_10_to_11.in
@@ -13,7 +13,7 @@ bindir=@MYSQL_BINDIR@
 PATH="$bindir:$PATH"
 db_name=${db_name:-@db_name@}
 
-if mysql $* -f <<END-OF-DATA
+if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 -- Fix bad index on Media table

diff --git a/bacula/updatedb/update_mysql_tables_11_to_12.in b/bacula/updatedb/update_mysql_tables_11_to_12.in
index da0b3d23a5fe17d651a6a5c322d3ace491f49beb..de9c1f921fb9f63b5392fab77825e75fa43e6e3c 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_11_to_12.in
+++ b/bacula/updatedb/update_mysql_tables_11_to_12.in
@@ -24,7 +24,7 @@ if [ $DBVERSION != 11 ] ; then
    exit 1
 fi
 
-if mysql $* -f <<END-OF-DATA
+if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 ALTER TABLE JobMedia DROP Stripe ;

diff --git a/bacula/updatedb/update_mysql_tables_4_to_5 b/bacula/updatedb/update_mysql_tables_4_to_5
index 0a797e4180f3f6cdfaf1c63baa0831dd3ab3db29..db1bf7de4742213d025920dc49363cd8b7459efa 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_4_to_5
+++ b/bacula/updatedb/update_mysql_tables_4_to_5
@@ -23,7 +23,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -ne "4" ]; then
        exit 1
 fi
 
-if $bindir/mysql -f <<END-OF-DATA
+if $bindir/mysql  <<END-OF-DATA
 USE bacula;
 ALTER TABLE Media ADD COLUMN VolUseDuration BIGINT UNSIGNED NOT NULL;
 ALTER TABLE Media ADD COLUMN MaxVolJobs INTEGER UNSIGNED NOT NULL;

diff --git a/bacula/updatedb/update_mysql_tables_5_to_6 b/bacula/updatedb/update_mysql_tables_5_to_6
index 06434c7e7aa59f271e62c96850fdf94af9976188..81a2b40c419392a6f8ae89e5bf9434c1d56414b8 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_5_to_6
+++ b/bacula/updatedb/update_mysql_tables_5_to_6
@@ -23,7 +23,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -ne "5" ]; then
        exit 1
 fi
 
-if $bindir/mysql $* -f <<END-OF-DATA
+if $bindir/mysql $*  <<END-OF-DATA
 USE bacula;
 
 ALTER TABLE JobMedia ADD COLUMN VolIndex INTEGER UNSIGNED NOT NULL;

diff --git a/bacula/updatedb/update_mysql_tables_6_to_7 b/bacula/updatedb/update_mysql_tables_6_to_7
index c2f416b385ba439fd35a26a37cec8966e7aa594e..1ebe1013e6d207fbb6bdc7c4228ef1b92a11bb16 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_6_to_7
+++ b/bacula/updatedb/update_mysql_tables_6_to_7
@@ -23,7 +23,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -ne "6" ]; then
        exit 1
 fi
 
-if $bindir/mysql $* -f <<END-OF-DATA
+if $bindir/mysql $*  <<END-OF-DATA
 USE bacula;
 
 ALTER TABLE Media ADD COLUMN InChanger TINYINT NOT NULL DEFAULT 0;

diff --git a/bacula/updatedb/update_mysql_tables_7_to_8 b/bacula/updatedb/update_mysql_tables_7_to_8
index 8cd6ed1af56a55fea58a6fc6a6febf7c0198b02e..fd756db8bcc44161ba2d15284030607618aa8d8d 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_7_to_8
+++ b/bacula/updatedb/update_mysql_tables_7_to_8
@@ -27,7 +27,7 @@ if [ -n "$DB_VER" ]; then
        fi
 fi
 
-if $bindir/mysql $* -f << END_OF_DATA
+if $bindir/mysql $*  << END_OF_DATA
 USE bacula;
 
 ALTER TABLE Media ADD COLUMN EndFile INTEGER UNSIGNED NOT NULL DEFAULT 0;

diff --git a/bacula/updatedb/update_mysql_tables_8_to_9 b/bacula/updatedb/update_mysql_tables_8_to_9
index 56ceff9f35b6d849b6be3080150928b0b3e52c37..935a04c5f6d342e9184939d078cffc76e37561c9 100755 (executable)
--- a/bacula/updatedb/update_mysql_tables_8_to_9
+++ b/bacula/updatedb/update_mysql_tables_8_to_9
@@ -9,7 +9,7 @@ echo "this script may take several minutes to run."
 echo " "
 bindir=/usr/bin
 
-if $bindir/mysql $* -f <<END-OF-DATA
+if $bindir/mysql $*  <<END-OF-DATA
 USE bacula;
 
 ALTER TABLE Media ADD COLUMN LabelType INTEGER UNSIGNED NOT NULL 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 4314f91d6a7f675f4480ee05db23b054f9b90ac0..885640293dbacc31b4fba15b482c8efcd8949ea4 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_9_to_10.in
+++ b/bacula/updatedb/update_mysql_tables_9_to_10.in
@@ -15,7 +15,7 @@ bindir=@MYSQL_BINDIR@
 PATH="$bindir:$PATH"
 db_name=${db_name:-@db_name@}
 
-if mysql $* -f <<END-OF-DATA
+if mysql $*  <<END-OF-DATA
 USE ${db_name};
 
 DROP TABLE IF EXISTS MAC;