From 705d182ed875589b0ad1c809ae6ba1cfadf55352 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sun, 7 Feb 2016 15:47:48 -0500 Subject: [PATCH] mysql eclasses: Add missing SQL command after setting root password wrt bug 574040 When updating the table by hand, we don't do FLUSH PRIVILEGES before inserting the next command which can stop the loading of the timezone and help tables. --- eclass/mysql-multilib-r1.eclass | 2 +- eclass/mysql-multilib.eclass | 2 +- eclass/mysql-v2.eclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index e14a2a832beb..1512b21d4ddb 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -952,7 +952,7 @@ mysql-multilib-r1_pkg_config() { ebegin "Setting root password" # Do this from memory, as we don't want clear text passwords in temp files - local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" "${EROOT}/usr/bin/mysql" \ --socket=${socket} \ -hlocalhost \ diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 69293f100497..b2e7dffa09ad 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1140,7 +1140,7 @@ mysql-multilib_pkg_config() { ebegin "Setting root password" # Do this from memory, as we don't want clear text passwords in temp files - local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" "${EROOT}/usr/bin/mysql" \ --socket=${socket} \ -hlocalhost \ diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 260420b5b402..556d37eba6ef 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -886,7 +886,7 @@ mysql-v2_pkg_config() { ebegin "Setting root password" # Do this from memory, as we don't want clear text passwords in temp files - local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" "${EROOT}/usr/bin/mysql" \ --socket=${socket} \ -hlocalhost \ -- 2.26.2