diff --git a/5.5/root/usr/share/container-scripts/mysql/passwd-change.sh b/5.5/root/usr/share/container-scripts/mysql/passwd-change.sh
index cd3f0a38..f0fb1a54 100644
--- a/5.5/root/usr/share/container-scripts/mysql/passwd-change.sh
+++ b/5.5/root/usr/share/container-scripts/mysql/passwd-change.sh
@@ -22,4 +22,3 @@ else
     FLUSH PRIVILEGES;
 EOSQL
 fi
-
diff --git a/root-common/usr/bin/run-mysqld b/root-common/usr/bin/run-mysqld
index 7ffd49e6..2aa2fa32 100755
--- a/root-common/usr/bin/run-mysqld
+++ b/root-common/usr/bin/run-mysqld
@@ -3,6 +3,9 @@
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
+if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+  set +e
+fi
 
 export_setting_variables
 
diff --git a/root-common/usr/bin/run-mysqld-master b/root-common/usr/bin/run-mysqld-master
index ed332eaa..f8b481e9 100755
--- a/root-common/usr/bin/run-mysqld-master
+++ b/root-common/usr/bin/run-mysqld-master
@@ -6,6 +6,9 @@
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
+if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+  set +e
+fi
 
 export_setting_variables
 
diff --git a/root-common/usr/bin/run-mysqld-slave b/root-common/usr/bin/run-mysqld-slave
index e1071ff0..d16a86da 100755
--- a/root-common/usr/bin/run-mysqld-slave
+++ b/root-common/usr/bin/run-mysqld-slave
@@ -6,6 +6,9 @@
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
+if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+  set +e
+fi
 
 export_setting_variables
 
diff --git a/root-common/usr/share/container-scripts/mysql/helpers.sh b/root-common/usr/share/container-scripts/mysql/helpers.sh
index 4e832fcd..bc5b0f8d 100644
--- a/root-common/usr/share/container-scripts/mysql/helpers.sh
+++ b/root-common/usr/share/container-scripts/mysql/helpers.sh
@@ -21,4 +21,7 @@ function log_volume_info {
     shift
   done
   set -e
+  if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+    set +e
+  fi
 }