summaryrefslogtreecommitdiff
path: root/debian/additions
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-01-24 12:29:31 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-01-24 12:29:31 +0200
commitd833bb65d53b9a4375fa71cc485b4719fdb0ee53 (patch)
treed1271339e1c3a660e4788a5c9913bfe54e0271f1 /debian/additions
parente431d90065d277e62fa4f81a1654790f58a84146 (diff)
parent76577e1e2602f3c30859a176808c433a263e1b0a (diff)
downloadmariadb-git-d833bb65d53b9a4375fa71cc485b4719fdb0ee53.tar.gz
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'debian/additions')
-rw-r--r--debian/additions/debian-start.inc.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh
index f50712882c1..08ec339bcba 100644
--- a/debian/additions/debian-start.inc.sh
+++ b/debian/additions/debian-start.inc.sh
@@ -65,7 +65,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='';" | $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');" | $MYSQL --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