commit:     aabb0e5a81d08b3327fc8813b21f664185cd3964
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 20:36:53 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 20:37:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabb0e5a

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

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

 dev-db/mysql/mysql-5.6.40-r2.ebuild | 2 +-
 dev-db/mysql/mysql-5.6.41.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/mysql-5.6.40-r2.ebuild 
b/dev-db/mysql/mysql-5.6.40-r2.ebuild
index 0c029e84c7a..0c2284e9080 100644
--- 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 da6e2f0d67a..5f5915701ab 100644
--- 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}" \

Reply via email to