From: Brian Evans <grknight@gentoo.org>
Date: Mon, 24 Sep 2018 20:36:53 +0000 (-0400)
Subject: dev-db/mysql: Fix initial password setting in 5.6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=aabb0e5a81d08b3327fc8813b21f664185cd3964;p=gentoo.git

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 0c029e84c7a1..0c2284e90808 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 da6e2f0d67a8..5f5915701abf 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}" \