summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-05-07 15:00:27 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-05-07 15:00:27 +0300
commit916b237b3f6ee4d8e113d480c53bca232cadbb7b (patch)
tree238054b502f633afcb88a3fb1929d860a7e96e91 /scripts
parenta04202673fe8f5a89a88e543e3e0f5b9de5215d2 (diff)
parent35977e81f967ebe10db8ee40703801e693b2a0f4 (diff)
downloadmariadb-git-916b237b3f6ee4d8e113d480c53bca232cadbb7b.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 6b0c78ef702..6d9aedb5e6f 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -612,12 +612,8 @@ then
echo
echo
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !"
- echo "To do so, start the server, then issue the following commands:"
+ echo "To do so, start the server, then issue the following command:"
echo
- echo "'$bindir/mysqladmin' -u root password 'new-password'"
- echo "'$bindir/mysqladmin' -u root -h $hostname password 'new-password'"
- echo
- echo "Alternatively you can run:"
echo "'$bindir/mysql_secure_installation'"
echo
echo "which will also give you the option of removing the test"