nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tell the client library to use CLIENT_LOCAL_FILES

Browse Source
This commit is contained in:
Marc Delisle
2004-09-21 01:34:15 +00:00
parent 70d7cacf97
commit 91b6f4c225
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2004-09-20 Marc Delisle <lem9@users.sourceforge.net> 2004-09-20 Marc Delisle <lem9@users.sourceforge.net>
* read_dump.php, libraries/read_dump.lib.php: bug #1030644, * read_dump.php, libraries/read_dump.lib.php: bug #1030644,
error importing when last table exported was empty 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)
2004-09-20 Michal Čihař <michal@cihar.com> 2004-09-20 Michal Čihař <michal@cihar.com>
* Documentation.html: Add info about theme generations. * Documentation.html: Add info about theme generations.

4
libraries/dbi/mysql.dbi.lib.php
View File

@@ -49,6 +49,10 @@ function PMA_DBI_connect($user, $password) {
if (PMA_MYSQL_CLIENT_API >= 32349) { if (PMA_MYSQL_CLIENT_API >= 32349) {
$client_flags = $cfg['Server']['compress'] && defined('MYSQL_CLIENT_COMPRESS') ? MYSQL_CLIENT_COMPRESS : 0; $client_flags = $cfg['Server']['compress'] && defined('MYSQL_CLIENT_COMPRESS') ? MYSQL_CLIENT_COMPRESS : 0;
// always use CLIENT_LOCAL_FILES as defined in mysql_com.h
// for the case where the client library was not compiled
// with --enable-local-infile
$client_flags |= 128;
} }
if (empty($client_clags)) { if (empty($client_clags)) {