diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-12-15 18:27:11 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-12-15 18:27:11 +1100 |
| commit | fa01ffb08e53b5da7cc1bd61e06b6904b0dd9887 (patch) | |
| tree | 218367728cb3d97a75f09c9beec94ca69b26ace2 /debian | |
| parent | 7df06dcbc39c45eaf887f32e27f76f45a31004dd (diff) | |
| parent | 03fee585c12cb6bc9e2e03b9c182fa4c6dad88b7 (diff) | |
| download | mariadb-git-fa01ffb08e53b5da7cc1bd61e06b6904b0dd9887.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/additions/debian-start.inc.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh index 8a59f877aca..74340e78480 100755 --- a/debian/additions/debian-start.inc.sh +++ b/debian/additions/debian-start.inc.sh @@ -27,7 +27,7 @@ function check_for_crashed_tables() { 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 "${MARIADB}" --skip-column-names --silent --batch \ + xargs -i ${MARIADB} --skip-column-names --silent --batch \ --force -e "{}" &>"${tempfile}" set -e @@ -72,7 +72,7 @@ function check_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');" | "$MARIADB" --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!" fi |