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

Bug: https://bugs.gentoo.org/666992 Signed-off-by: Brian Evans <[email protected]> Package-Manager: Portage-2.3.50, Repoman-2.3.10
johu · Sep 24, 2018 · aabb0e5 · aabb0e5
1 parent 5aeb578
commit aabb0e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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}" \