From 095693582a5c7b5dbb66ab7dda3cc03b00927724 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Thu, 12 Jan 2017 15:15:22 +0100
Subject: [PATCH] mysql: fix my-add.sh when no password

---
 mysql/files/my-add.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql/files/my-add.sh b/mysql/files/my-add.sh
index e27e924d..b649a209 100755
--- a/mysql/files/my-add.sh
+++ b/mysql/files/my-add.sh
@@ -125,8 +125,9 @@ mysql_add() {
         exit 1
     fi
     if [ -z "${password}" ]; then
+	password=$(mysql mysql -Ne "SELECT Password FROM user WHERE User='${user}' AND Host='localhost';")
         echo -n "Grant '${user}' to '${db}' database ..."
-        mysql -e "GRANT ALL PRIVILEGES ON ${db}.* TO ${user}@localhost;"
+        mysql -e "GRANT ALL PRIVILEGES ON ${db}.* TO ${user}@localhost IDENTIFIED BY PASSWORD '${password}';"
         grant=$?
     else
         echo -n "Grant '${user}' to '${db}' database with password '${password}' ..."