From eed6b3c6f189fcb318a38ef70c66d1501123f342 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Mon, 28 Mar 2011 15:53:05 -0400
Subject: [PATCH] the new rescue-module is now able to rescue (restart) mysql

---
 server/lib/classes/db_mysql.inc.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 445563e..2c113b5 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -61,8 +61,8 @@
 		function updateError($location)
 		{
 			global $app;
-			$this->errorNumber = mysql_errno($this->linkId);
-			$this->errorMessage = mysql_error($this->linkId);
+			$this->errorNumber = @mysql_errno($this->linkId);
+			$this->errorMessage = @mysql_error($this->linkId);
 			$this->errorLocation = $location;
 			if($this->errorNumber && $this->show_error_messages && method_exists($app,'log'))
 			{
@@ -76,7 +76,7 @@
 		{
 			if($this->linkId == 0)
 			{
-				$this->linkId = mysql_connect($this->dbHost, $this->dbUser, $this->dbPass);
+				$this->linkId = @mysql_connect($this->dbHost, $this->dbUser, $this->dbPass);
 				if(!$this->linkId)
 				{
 					$this->updateError('DB::connect()-> mysql_connect');
@@ -463,7 +463,7 @@
        return $this->query($sql);
        }
        
-       // gibt Array mit Tabellennamen zur�ck
+       // gibt Array mit Tabellennamen zur�ck
        function getTables($database_name = '') {
 	   	
 			if($database_name == '') $database_name = $this->dbName;
@@ -474,7 +474,7 @@
             return $tb_names;       
        }
        
-       // gibt Feldinformationen zur Tabelle zur�ck
+       // gibt Feldinformationen zur Tabelle zur�ck
        /*
        $columns = array(action =>   add | alter | drop
                         name =>     Spaltenname

--
Gitblit v1.9.1