iliaa           Tue Dec 30 19:11:13 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/pdo_mysql      mysql_driver.c 
  Log:
  
  MFB: Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.13.2.5.2.6&r2=1.59.2.13.2.5.2.7&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.6 
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.7
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.6      Mon Oct 27 
18:32:08 2008
+++ php-src/ext/pdo_mysql/mysql_driver.c        Tue Dec 30 19:11:13 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysql_driver.c,v 1.59.2.13.2.5.2.6 2008/10/27 18:32:08 johannes Exp $ 
*/
+/* $Id: mysql_driver.c,v 1.59.2.13.2.5.2.7 2008/12/30 19:11:13 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -657,12 +657,12 @@
                {
                        local_infile = 0;
                }
-
+#ifdef MYSQL_OPT_LOCAL_INFILE
                if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const 
char *)&local_infile)) {
                        pdo_mysql_error(dbh);
                        goto cleanup;
                }
-
+#endif
 #ifdef MYSQL_OPT_RECONNECT
                /* since 5.0.3, the default for this option is 0 if not 
specified.
                 * we want the old behaviour */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to