| 1 |
commit: aabb0e5a81d08b3327fc8813b21f664185cd3964 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 24 20:36:53 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 24 20:37:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabb0e5a |
| 7 |
|
| 8 |
dev-db/mysql: Fix initial password setting in 5.6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/666992 |
| 11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.50, Repoman-2.3.10 |
| 13 |
|
| 14 |
dev-db/mysql/mysql-5.6.40-r2.ebuild | 2 +- |
| 15 |
dev-db/mysql/mysql-5.6.41.ebuild | 2 +- |
| 16 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mysql/mysql-5.6.40-r2.ebuild b/dev-db/mysql/mysql-5.6.40-r2.ebuild |
| 19 |
index 0c029e84c7a..0c2284e9080 100644 |
| 20 |
--- a/dev-db/mysql/mysql-5.6.40-r2.ebuild |
| 21 |
+++ b/dev-db/mysql/mysql-5.6.40-r2.ebuild |
| 22 |
@@ -758,7 +758,7 @@ pkg_config() { |
| 23 |
|
| 24 |
ebegin "Setting root password" |
| 25 |
# Do this from memory, as we don't want clear text passwords in temp files |
| 26 |
- local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'" |
| 27 |
+ local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}');" |
| 28 |
"${EROOT%/}/usr/bin/mysql" \ |
| 29 |
--no-defaults \ |
| 30 |
"--socket=${socket}" \ |
| 31 |
|
| 32 |
diff --git a/dev-db/mysql/mysql-5.6.41.ebuild b/dev-db/mysql/mysql-5.6.41.ebuild |
| 33 |
index da6e2f0d67a..5f5915701ab 100644 |
| 34 |
--- a/dev-db/mysql/mysql-5.6.41.ebuild |
| 35 |
+++ b/dev-db/mysql/mysql-5.6.41.ebuild |
| 36 |
@@ -758,7 +758,7 @@ pkg_config() { |
| 37 |
|
| 38 |
ebegin "Setting root password" |
| 39 |
# Do this from memory, as we don't want clear text passwords in temp files |
| 40 |
- local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'" |
| 41 |
+ local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}');" |
| 42 |
"${EROOT%/}/usr/bin/mysql" \ |
| 43 |
--no-defaults \ |
| 44 |
"--socket=${socket}" \ |
Archives