diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 11:36:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 11:36:10 +0200 |
| commit | c194db34d93d8d94bd52b17349063fa401e3f942 (patch) | |
| tree | 1b0a2eef1463fbb207b3ebcdcb3ce9557fa508ad /debian | |
| parent | 802e26c3478e8e39aeacbb95edcd8f90973a6303 (diff) | |
| parent | 3217ecd7085a64b7e7ff89aeefbd9a09a139b6e4 (diff) | |
| download | mariadb-git-c194db34d93d8d94bd52b17349063fa401e3f942.tar.gz | |
Merge 10.10 into 10.11
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 |