beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Connection through socket

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@607 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-05-19 12:06:49 +00:00
parent 1b97f48ea8
commit d204a6ea15
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes.txt
View file

@ -1,3 +1,6 @@
phpMinAdmin 1.10.2:
Connection through socket by server :/path/to/socket
phpMinAdmin 1.10.1:
Highlight odd and hover rows
Partition editing comfort (bug #2783446)

5
mysql.inc.php
View file

@ -14,7 +14,8 @@ if (extension_loaded("mysqli")) {
(strlen("$server$username") ? $username : ini_get("mysqli.default_user")),
(strlen("$server$username$password") ? $password : ini_get("mysqli.default_pw")),
null,
(strlen($port) ? $port : ini_get("mysqli.default_port"))
(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
(!is_numeric($port) ? $port : null)
);
}
@ -175,7 +176,7 @@ if (extension_loaded("mysqli")) {
var $extension = "PDO_MySQL";
function connect($server, $username, $password) {
$this->dsn("mysql:host=" . str_replace(":", ";port=", $server), $username, $password);
$this->dsn("mysql:host=" . str_replace(":", ";unix_socket=", preg_replace('~:([0-9])~', ';port=\\1', $server)), $username, $password);
$this->server_info = $this->result($this->query("SELECT VERSION()"));
return true;
}