diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 11:24:07 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 11:24:07 +0200 |
commit | 3217ecd7085a64b7e7ff89aeefbd9a09a139b6e4 (patch) | |
tree | fb9e8b62e8280fab9bc86fde69a533c9011e7a8b /debian | |
parent | fc9d350ab7beff384926d9975dee9ab52b4cfe94 (diff) | |
parent | 9b3eae88153b4a47c86b93999d3110ba18c9c6af (diff) | |
download | mariadb-git-3217ecd7085a64b7e7ff89aeefbd9a09a139b6e4.tar.gz |
Merge 10.9 into 10.10
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 |