MDEV-34902: debian-start erroneously reports issues

Remove the complexity of check_for_crashed_tables
by using mariadb-check directly. This can auto-repair. We
use --fast to limit to Aria and MyISAM tables
per the CHECK TABLES FAST option.

Added a check_for_crashed_system_tables on the
system tables before an upgrade to ensure they are
ready to be upgraded.

Removed the mail part of checking tables.
With this removed there is no need for a mailx
package recommendation.

Adjusted the bash scripts to use arrays for
correct command execution.

Corrected message for insecure passwords to
refer to the mysql.global_privs table.

Author: grooverdan

debian/additions/debian-start

@@ -22,26 +22,24 @@ then
   . /etc/default/mariadb
 fi
 
-MARIADB="/usr/bin/mariadb --defaults-extra-file=/etc/mysql/debian.cnf"
-MYADMIN="/usr/bin/mariadb-admin --defaults-extra-file=/etc/mysql/debian.cnf"
+MARIADB=(/usr/bin/mariadb --defaults-extra-file=/etc/mysql/debian.cnf)
 # Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once
-MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
-MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables"
-MYCHECK_RCPT="${MYCHECK_RCPT:-root}"
+MYUPGRADE=(/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent)
+MARIADBCHECK=(/usr/bin/mariadb-check --defaults-extra-file=/etc/mysql/debian.cnf --fast --auto-repair --silent)
+MARIADBCHECK_ALL=( "${MARIADBCHECK}" --all-databases)
 
 ## Checking for corrupt, not cleanly closed (only for MyISAM and Aria engines) and upgrade needing tables.
 
 # The following commands should be run when the server is up but in background
 # where they do not block the server start and in one shell instance so that
 # they run sequentially. They are supposed not to echo anything to stdout.
-# If you want to disable the check for crashed tables comment
-# "check_for_crashed_tables" out.
 # (There may be no output to stdout inside the background process!)
 
 # Need to ignore SIGHUP, as otherwise a SIGHUP can sometimes abort the upgrade
 # process in the middle.
 trap "" SIGHUP
 (
+  check_for_crashed_system_tables;
   upgrade_system_tables_if_necessary;
   check_root_accounts;
   check_for_crashed_tables;

debian/additions/debian-start.inc.sh

@@ -3,60 +3,26 @@
 # This file is included by /etc/mysql/debian-start
 #
 
+## Is there MyISAM or Aria system tables needing fixing
+# We want to recover these quickly before an upgrade.
+function check_for_crashed_system_tables()
+{
+  set -e
+  set -u
+
+  logger -p daemon.info -i -t"$0" "Triggering fast check and recovery for system tables"
+  "${MARIADBCHECK[@]}" mysql
+}
+
 ## Is there MyISAM or Aria unclosed tables.
 # - Requires the server to be up.
 # - Is supposed to run silently in background.
 function check_for_crashed_tables() {
   set -e
   set -u
 
-  # But do it in the background to not stall the boot process.
-  logger -p daemon.info -i -t"$0" "Triggering myisam-recover for all MyISAM tables and aria-recover for all Aria tables"
-
-  # Checking for $? is unreliable so the size of the output is checked.
-  # Some table handlers like HEAP do not support CHECK TABLE.
-  tempfile=$(mktemp)
-
-  # We have to use xargs in this case, because a for loop barfs on the
-  # spaces in the thing to be looped over.
-
-  # If a crashed table is encountered, the "mariadb" command will return with a status different from 0
-  #
-  # The first query will generate lines like.
-  #   select count(*) into @discard from 'mysql'.'db'
-  # The second line will load all tables without printing any actual results,
-  # but may show warnings and definitely is expected to have some error and
-  # exit code if crashed tables are encountered.
-  #
-  # Note that inside single quotes must be quoted with '\'' (to be outside of single quotes).
-  set +e
-  # The $MARIADB is intentionally used to expand into a command and arguments
-  # shellcheck disable=SC2086
-  echo '
-    SELECT CONCAT("select count(*) into @discard from '\''", TABLE_SCHEMA, "'\''.'\''", TABLE_NAME, "'\''")
-    FROM information_schema.TABLES WHERE TABLE_SCHEMA<>"INFORMATION_SCHEMA" AND TABLE_SCHEMA<>"PERFORMANCE_SCHEMA"
-    AND (ENGINE="MyISAM" OR ENGINE="Aria")
-    ' | \
-    LC_ALL=C $MARIADB --skip-column-names --batch | \
-    xargs --no-run-if-empty -i $MARIADB --skip-column-names --silent --batch --force -e "{}" &> "${tempfile}"
-  set -e
-
-  if [ -s "$tempfile" ]
-  then
-    (
-      /bin/echo -e "\n" \
-        "Improperly closed tables are also reported if clients are accessing\n" \
-        "the tables *now*. A list of current connections is below.\n";
-        $MYADMIN processlist status
-    ) >> "${tempfile}"
-    # Check for presence as a dependency on mailx would require an MTA.
-    if [ -x /usr/bin/mailx ]
-    then
-      mailx -e -s"$MYCHECK_SUBJECT" "$MYCHECK_RCPT" < "$tempfile"
-    fi
-    (echo "$MYCHECK_SUBJECT"; cat "${tempfile}") | logger -p daemon.warn -i -t"$0"
-  fi
-  rm "${tempfile}"
+  logger -p daemon.info -i -t"$0" "Triggering fast check and recovery for all tables"
+  "${MARIADBCHECK_ALL[@]}"
 }
 
 ## Check for tables needing an upgrade.
@@ -70,7 +36,7 @@ function upgrade_system_tables_if_necessary() {
 
   # Filter all "duplicate column", "duplicate key" and "unknown column"
   # errors as the script is designed to be idempotent.
-  LC_ALL=C $MYUPGRADE \
+  LC_ALL=C "${MYUPGRADE[@]}" \
     2>&1 \
     | grep -E -v '^(1|@had|ERROR (1051|1054|1060|1061|1146|1347|1348))' \
     | logger -p daemon.warn -i -t"$0"
@@ -90,9 +56,9 @@ function check_root_accounts() {
            JSON_VALUE(priv, '$.plugin') in ('mysql_native_password', 'mysql_old_password', 'parsec') AND
            JSON_VALUE(priv, '$.authentication_string') = '' AND
            JSON_VALUE(priv, '$.password_last_changed') != 0
-     " | $MARIADB --skip-column-names)
+     " | "${MARIADB[@]}" --skip-column-names)
   if [ "$ret" -ne "0" ]
   then
-    logger -p daemon.warn -i -t"$0" "WARNING: mysql.user contains $ret root accounts without password!"
+    logger -p daemon.warn -i -t"$0" "WARNING: mysql.global_priv contains $ret root accounts without password!"
   fi
 }

debian/control

@@ -674,8 +674,7 @@ Description: MariaDB database core server files
 
 Package: mariadb-server
 Architecture: any
-Suggests: mailx,
-          mariadb-test,
+Suggests: mariadb-test,
           netcat-openbsd
 Recommends: libhtml-template-perl,
             pv