diff options
author | Daniel Black <daniel@mariadb.org> | 2022-12-15 10:32:58 +1100 |
---|---|---|
committer | Daniel Black <daniel@mariadb.org> | 2022-12-15 10:32:58 +1100 |
commit | 802e26c3478e8e39aeacbb95edcd8f90973a6303 (patch) | |
tree | 9942becedb79dbee9ee55a95970d746866841183 /debian | |
parent | c1fd082e9c7369f4511eb5a52e58cb15489caa74 (diff) | |
parent | fc9d350ab7beff384926d9975dee9ab52b4cfe94 (diff) | |
download | mariadb-git-802e26c3478e8e39aeacbb95edcd8f90973a6303.tar.gz |
Merge branch '10.10' into 10.11
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/additions/debian-start | 12 | ||||
-rwxr-xr-x | debian/additions/debian-start.inc.sh | 28 | ||||
-rw-r--r-- | debian/mariadb-server.postinst | 6 |
3 files changed, 23 insertions, 23 deletions
diff --git a/debian/additions/debian-start b/debian/additions/debian-start index 986fa80fd57..2a8b61ddaff 100755 --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -17,12 +17,12 @@ if [ -f /etc/default/mariadb ]; then . /etc/default/mariadb fi -MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf" -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -# Don't run full mysql_upgrade on every server restart, use --version-check to do it only once -MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent" -MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf" -MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables" +MARIADB="/usr/bin/mariadb --defaults-file=/etc/mysql/debian.cnf" +MYADMIN="/usr/bin/mariadb-admin --defaults-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="/usr/bin/mariadb-check --defaults-file=/etc/mysql/debian.cnf" +MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables" MYCHECK_PARAMS="--all-databases --fast --silent" MYCHECK_RCPT="${MYCHECK_RCPT:-root}" diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh index 005aa290866..8a59f877aca 100755 --- a/debian/additions/debian-start.inc.sh +++ b/debian/additions/debian-start.inc.sh @@ -11,7 +11,7 @@ function check_for_crashed_tables() { 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" + 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. @@ -20,15 +20,15 @@ function check_for_crashed_tables() { # 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 "mysql" command will return with a status different from 0 + # If a crashed table is encountered, the "mariadb" command will return with a status different from 0 set +e - LC_ALL=C $MYSQL --skip-column-names --batch -e ' + LC_ALL=C $MARIADB --skip-column-names --batch -e ' 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'\'' )' | \ - xargs -i $MYSQL --skip-column-names --silent --batch \ - --force -e "{}" &>$tempfile + xargs -i "${MARIADB}" --skip-column-names --silent --batch \ + --force -e "{}" &>"${tempfile}" set -e if [ -s "$tempfile" ]; then @@ -37,14 +37,14 @@ function check_for_crashed_tables() { "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 + ) >> "${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 + mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < "$tempfile" fi - (echo "$MYCHECK_SUBJECT"; cat $tempfile) | logger -p daemon.warn -i -t$0 + (echo "$MYCHECK_SUBJECT"; cat "${tempfile}") | logger -p daemon.warn -i -t"$0" fi - rm $tempfile + rm "${tempfile}" } ## Check for tables needing an upgrade. @@ -54,14 +54,14 @@ function upgrade_system_tables_if_necessary() { set -e set -u - logger -p daemon.info -i -t$0 "Upgrading MySQL tables if necessary." + logger -p daemon.info -i -t"$0" "Upgrading MySQL 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 \ 2>&1 \ | egrep -v '^(1|@had|ERROR (1051|1054|1060|1061|1146|1347|1348))' \ - | logger -p daemon.warn -i -t$0 + | logger -p daemon.warn -i -t"$0" } ## Check for the presence of both, root accounts with and without password. @@ -70,10 +70,10 @@ function check_root_accounts() { set -e set -u - logger -p daemon.info -i -t$0 "Checking for insecure root accounts." + logger -p daemon.info -i -t"$0" "Checking for insecure root accounts." - ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | $MYSQL --skip-column-names ) + ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | "$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.user contains $ret root accounts without password!" fi } diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst index 2e89e983d95..dff7dc2d532 100644 --- a/debian/mariadb-server.postinst +++ b/debian/mariadb-server.postinst @@ -17,7 +17,7 @@ set -o pipefail case "$1" in configure) - # This is needed because mysql_install_db removes the pid file in /run + # This is needed because mariadb-install-db removes the pid file in /run # and because changed configuration options should take effect immediately. # In case the server wasn't running at all it should be ok if the stop # script fails. I can't tell at this point because of the cleaned /run. @@ -162,12 +162,12 @@ EOF # initiate databases. Output is not allowed by debconf :-( # This will fail if we are upgrading an existing database; in this case - # mysql_upgrade, called from the /etc/init.d/mariadb start script, will + # mariadb-upgrade, called from the /etc/mysql/debian-start script, will # handle things. # Debian: beware of the bashisms... # Debian: can safely run on upgrades with existing databases set +e - bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql \ + bash /usr/bin/mariadb-install-db --rpm --cross-bootstrap --user=mysql \ --disable-log-bin --skip-test-db 2>&1 | \ $ERR_LOGGER set -e |