diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index f01bc686d08..70367b9bc3b 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -564,6 +564,10 @@ function connect() { $this->connection = mysql_pconnect($config['host'] . ':' . $config['port'], $config['login'], $config['password']); } + if (!$this->connection) { + return false; + } + if (mysql_select_db($config['database'], $this->connection)) { $this->connected = true; } diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php index f191273c8ef..c71ee91c161 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysqli.php +++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php @@ -64,6 +64,8 @@ function connect() { if ($this->connection !== false) { $this->connected = true; + } else { + return false; } $this->_useAlias = (bool)version_compare(mysqli_get_server_info($this->connection), "4.1", ">=");