Merge branch '3.0/develop' into 3.1/develop

kohana · Jul 4, 2011 · 6a0a9bb · 6a0a9bb
2 parents b9deff5 + f7433b1
commit 6a0a9bb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/classes/kohana/database/mysql.php b/classes/kohana/database/mysql.php
@@ -59,14 +59,14 @@ public function connect()
 				$this->_connection = mysql_connect($hostname, $username, $password, TRUE);
 			}
 		}
-		catch (ErrorException $e)
+		catch (Exception $e)
 		{
 			// No connection exists
 			$this->_connection = NULL;
 
 			throw new Database_Exception(':error',
-				array(':error' => mysql_error()),
-				mysql_errno());
+				array(':error' => $e->getMessage()),
+				$e->getCode());
 		}
 
 		// \xFF is a better delimiter, but the PHP driver uses underscore