From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 22 Nov 2022 08:33:20 +0000 (+0100)
Subject: Fix org#2577 Remove -f option from MySQL update scripts to detect errors properly
X-Git-Tag: Release-13.0.2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b1ea26410634696821eb67a48603456ee88d634;p=thirdparty%2Fbacula.git

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 7f2ab8698..d4bb96dae 100644
--- 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 1f6eec544..0a569da4a 100644
--- 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 3794537b8..15fe3a8b2 100644
--- 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 df0956b26..29722e4f6 100644
--- 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 1b625e9bd..6005b5d85 100644
--- 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 195a63496..57330a248 100644
--- 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 796705817..2df12f82b 100644
--- 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 da0b3d23a..de9c1f921 100644
--- 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 0a797e418..db1bf7de4 100755
--- 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 06434c7e7..81a2b40c4 100755
--- 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 c2f416b38..1ebe1013e 100755
--- 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 8cd6ed1af..fd756db8b 100755
--- 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 56ceff9f3..935a04c5f 100755
--- 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 4314f91d6..885640293 100644
--- 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;