summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-16 10:31:22 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-16 10:31:22 +0200
commit299280738c5c1d780c7633a5b4ef9a59a9ed0f37 (patch)
treef6450929dd7d1cd6141317c92211aef421d98c76 /debian
parent6524551bcf5f493c86c25e6e8c115a8df17fa7bb (diff)
parent0a67daad060459c27a1fb776e0a654a76c457804 (diff)
downloadmariadb-git-299280738c5c1d780c7633a5b4ef9a59a9ed0f37.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/additions/debian-start.inc.sh4
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