From 90350b0ca0518b000adb4407174887f086a25c8b Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael@hierweck.de>
Date: Thu, 28 Aug 2014 19:53:21 +0200
Subject: [PATCH] Killall before dropping mysql databases/users.

---
 .../src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java    | 1 +
 hsarback/src/de/hsadmin/mods/db/MySqlUserProcessorFactory.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java b/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
index df1741b..ea91ea0 100644
--- a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
@@ -56,6 +56,7 @@ public class MySqlDatabaseProcessorFactory implements EntityProcessorFactory {
 		String aName = AbstractEntity.escapeString(db.getName());
 		String aOwner = AbstractEntity.escapeString(db.getOwner());
 		aJDBCP.addSQL("REVOKE ALL ON " + aName + ".* FROM '" + aOwner + "'@'%'");
+		aJDBCP.addSQL("CALL mysql.kill_by_database('" + aName + "');");
 		aJDBCP.addSQL("DROP DATABASE IF EXISTS " + aName);
 		return aJDBCP;
 	}
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlUserProcessorFactory.java b/hsarback/src/de/hsadmin/mods/db/MySqlUserProcessorFactory.java
index f8841c8..199f675 100644
--- a/hsarback/src/de/hsadmin/mods/db/MySqlUserProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/db/MySqlUserProcessorFactory.java
@@ -41,6 +41,7 @@ public class MySqlUserProcessorFactory implements EntityProcessorFactory {
 		JDBCProcessor aJDBCP = MySqlDatabaseProcessorFactory.createMySqlAdminProcessor();
 		String aName = AbstractEntity.escapeString(dbu.getName());
 		aJDBCP.addSQL("REVOKE ALL PRIVILEGES, GRANT OPTION FROM '" + aName + "'@'%'");
+		aJDBCP.addSQL("CALL mysql.kill_by_user('" + aName + "');");
 		aJDBCP.addSQL("DROP USER '" + aName + "'@'%'");
 		return aJDBCP;
 	}