From 09b790e9c59c496ec1aa537ff7bfa21ca0f4b5cd Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 15 Feb 2016 03:38:06 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 server/plugins-available/mysql_clientdb_plugin.inc.php |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index 7a5128a..743d27a 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -228,7 +228,6 @@
 
 			}
 
-			$link->query('FLUSH PRIVILEGES;');
 			$link->close();
 		}
 	}
@@ -433,7 +432,6 @@
 						}
 					}
 					// Database is not active, so stop processing here
-					$link->query('FLUSH PRIVILEGES;');
 					$link->close();
 					return;
 				}
@@ -570,8 +568,6 @@
 				}
 			}
 
-
-			$link->query('FLUSH PRIVILEGES;');
 			$link->close();
 		}
 
@@ -621,7 +617,6 @@
 				$app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error, LOGLEVEL_WARNING);
 			}
 
-			$link->query('FLUSH PRIVILEGES;');
 			$link->close();
 		}
 
@@ -685,7 +680,6 @@
 			}
 		}
 
-		$link->query('FLUSH PRIVILEGES;');
 		$link->close();
 
 	}
@@ -721,7 +715,6 @@
 			}
 		}
 
-		$link->query('FLUSH PRIVILEGES;');
 		$link->close();
 	}
 

--
Gitblit v1.9.1