From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/lib/classes/db_mysql.inc.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index e3d0c69..7c46820 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -554,21 +554,24 @@
public function getDatabaseSize($database_name) {
global $app;
+
include 'lib/mysql_clientdb.conf';
+
/* Connect to the database */
$link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
if (!$link) {
- $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_DEBUG);
+ $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG);
return;
}
+
/* Get database-size from information_schema */
- $result=mysqli_query("SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".mysqli_real_escape_string($database_name)."';", $link);
- $this->close;
- if (!$result) {
- $app->log('Unable to get the database-size'.mysqli_error($link), LOGLEVEL_DEBUG);
+ $result = mysqli_query($link, "SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".mysqli_real_escape_string($link, $database_name)."'");
+ if(!$result) {
+ $app->log('Unable to get the database-size for ' . $database_name . ': '.mysqli_error($link), LOGLEVEL_DEBUG);
return;
}
$database_size = mysqli_fetch_row($result);
+ mysqli_close($link);
return $database_size[0];
}
--
Gitblit v1.9.1