diff --git a/ChangeLog b/ChangeLog
index 3f1c59770..1e895fe35 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2004-09-20 Marc Delisle  <lem9@users.sourceforge.net>
     * 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)
 
 2004-09-20 Michal Čihař  <michal@cihar.com>
     * Documentation.html: Add info about theme generations.
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 19086f2bf..c5eb35cb5 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -49,6 +49,10 @@ function PMA_DBI_connect($user, $password) {
 
     if (PMA_MYSQL_CLIENT_API >= 32349) {
         $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)) {