From 4f038741c388c88b0bbbc163ee62ccd44a720172 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Thu, 20 Oct 2016 13:27:00 +0300
Subject: mariadb: avoid editting mysql tables

---
 modules/apps/mariadb/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'modules/apps/mariadb')

diff --git a/modules/apps/mariadb/default.nix b/modules/apps/mariadb/default.nix
index 4574be6..058eaa8 100644
--- a/modules/apps/mariadb/default.nix
+++ b/modules/apps/mariadb/default.nix
@@ -134,18 +134,22 @@ let
     mysql_upgrade --user=${cfg.user}
     mysql_tzinfo_to_sql "$TZDIR" | mysql mysql
     mysql mysql < ${./procedures.sql}
-    cat <<'__SQL__' | mysql
+
+    cat <<'__SQL__' | mysql -N mysql | mysql -v mysql
+    SELECT CONCAT("DROP USER IF EXISTS '", User, "'@'", Host, "';")
+    FROM user
+    WHERE User IN ('root', ${"''"})
+       OR (User='${cfg.user}' AND Host <> 'localhost')
+       ;
+    __SQL__
+
+    cat <<'__SQL__' | mysql -v mysql
     DROP DATABASE IF EXISTS test;
-    DELETE FROM mysql.db WHERE Db='test' OR Db='test%';
-    DELETE FROM mysql.user WHERE User='${cfg.user}' AND Host NOT IN ('localhost');
-    DELETE FROM mysql.user WHERE User=${"''"};
-    DELETE FROM mysql.user WHERE User='root';
-    DELETE FROM mysql.proxies_priv WHERE User='root';
-    FLUSH PRIVILEGES;
     ${concatMapStrings (db: ''
     CREATE DATABASE IF NOT EXISTS `${db}`;
     '') cfg.databases}
     __SQL__
+
     ${optionalString hasMasters "mysql -e 'START ALL SLAVES'"}
   '';
 
-- 
cgit v1.2.3