mysqli and default socket
This commit is contained in:
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
|
|||||||
$Id$
|
$Id$
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
|
2004-06-07 Marc Delisle <lem9@users.sourceforge.net>
|
||||||
|
* libraries/dbi/mysqli.dbi.lib.php: omit last parameter when calling
|
||||||
|
mysqli_connect() to enable the use of default socket
|
||||||
|
|
||||||
2004-06-07 Michal Čihař <michal@cihar.com>
|
2004-06-07 Michal Čihař <michal@cihar.com>
|
||||||
* lang/czech: Updated.
|
* lang/czech: Updated.
|
||||||
|
|
||||||
|
@@ -43,7 +43,12 @@ function PMA_DBI_connect($user, $password) {
|
|||||||
? FALSE
|
? FALSE
|
||||||
: $cfg['Server']['socket'];
|
: $cfg['Server']['socket'];
|
||||||
|
|
||||||
$link = @mysqli_connect($cfg['Server']['host'], $user, $password, FALSE, $server_port, $server_socket);
|
if ($server_socket) {
|
||||||
|
$link = @mysqli_connect($cfg['Server']['host'], $user, $password, FALSE, $server_port, $server_socket);
|
||||||
|
} else {
|
||||||
|
// Omit the last parameter to enable connection to the default socket
|
||||||
|
$link = @mysqli_connect($cfg['Server']['host'], $user, $password, FALSE, $server_port);
|
||||||
|
}
|
||||||
|
|
||||||
if (empty($link)) {
|
if (empty($link)) {
|
||||||
PMA_auth_fails();
|
PMA_auth_fails();
|
||||||
|
Reference in New Issue
Block a user