From edf806b98d675a2037b019644aff76b7e8b7738c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 21 Nov 2011 02:33:09 -0500
Subject: [PATCH] Merged revisions 2741-2788 from SVN stable branch.
---
install/autoupdate.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index a9863ce..ba5b1a1 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -144,6 +144,11 @@
die("internal error - MYSQL-Root passord not known");
}
+//** Test mysql root connection
+if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
+ die("internal error - MYSQL-Root passord wrong");
+}
+
/*
* Check all tables
*/
@@ -156,7 +161,6 @@
//* initialize the database
$inst->db = new db();
-$inst->db->dbName = $conf["mysql"]["database"];
/*
* The next line is a bit tricky!
--
Gitblit v1.9.1