dev-db/mysql: Fix initial password setting in 5.6

Bug: https://bugs.gentoo.org/666992
Signed-off-by: Brian Evans <grknight@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.10

diff --git a/dev-db/mysql/mysql-5.6.40-r2.ebuild b/dev-db/mysql/mysql-5.6.40-r2.ebuild
index 0c029e84c7a1ffea907b1339c685f704f2ff0611..0c2284e908085e73092347f20ee39887b7625e91 100644 (file)
--- a/dev-db/mysql/mysql-5.6.40-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.40-r2.ebuild
@@ -758,7 +758,7 @@ pkg_config() {
 
        ebegin "Setting root password"
        # Do this from memory, as we don't want clear text passwords in temp files
-       local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
+       local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}');"
        "${EROOT%/}/usr/bin/mysql" \
                --no-defaults \
                "--socket=${socket}" \

diff --git a/dev-db/mysql/mysql-5.6.41.ebuild b/dev-db/mysql/mysql-5.6.41.ebuild
index da6e2f0d67a8b274132477e28d32780e19dfba38..5f5915701abf09b06593444c2d1258e7225c4f73 100644 (file)
--- a/dev-db/mysql/mysql-5.6.41.ebuild
+++ b/dev-db/mysql/mysql-5.6.41.ebuild
@@ -758,7 +758,7 @@ pkg_config() {
 
        ebegin "Setting root password"
        # Do this from memory, as we don't want clear text passwords in temp files
-       local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
+       local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}');"
        "${EROOT%/}/usr/bin/mysql" \
                --no-defaults \
                "--socket=${socket}" \