This commit is contained in:
Marc Delisle
2004-09-21 13:33:11 +00:00
parent 7321306e7f
commit 08400b2222
2 changed files with 5 additions and 2 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-09-21 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/mysql.dbi.lib.php: typo, thanks to Matthias Pigulla
2004-09-21 Alexander M. Turek <me@derrabus.de>
* db_details.php, read_dump.php, tbl_query_box.php: Allow import of
non-UTF-8 SQL dumps. Thanks to Marc for the initial patch.
@@ -17,7 +20,7 @@ $Source$
* read_dump.php, libraries/read_dump.lib.php: bug #1030644,
error importing when last table exported was empty
* libraries/dbi/mysql.dbi.lib.php: tell the client library to use
CLIENT_LOCAL_FILES (flag 128)
CLIENT_LOCAL_FILES (flag 128), thanks to Matthias Pigulla
2004-09-20 Michal Čihař <michal@cihar.com>
* Documentation.html: Add info about theme generations.

View File

@@ -55,7 +55,7 @@ function PMA_DBI_connect($user, $password) {
$client_flags |= 128;
}
if (empty($client_clags)) {
if (empty($client_flags)) {
$connect_func = 'mysql_' . ($cfg['PersistentConnections'] ? 'p' : '') . 'connect';
$link = @$connect_func($cfg['Server']['host'] . $server_port . $server_socket, $user, $password);
} else {