iliaa Tue Dec 30 19:10:59 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_mysql mysql_driver.c
/php-src NEWS
Log:
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.6&r2=1.59.2.13.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.6
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.7
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.6 Mon Dec 31 07:20:09 2007
+++ php-src/ext/pdo_mysql/mysql_driver.c Tue Dec 30 19:10:59 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_driver.c,v 1.59.2.13.2.6 2007/12/31 07:20:09 sebastian Exp $ */
+/* $Id: mysql_driver.c,v 1.59.2.13.2.7 2008/12/30 19:10:59 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -496,12 +496,12 @@
if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) {
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 */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1372&r2=1.2027.2.547.2.1373&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1372 php-src/NEWS:1.2027.2.547.2.1373
--- php-src/NEWS:1.2027.2.547.2.1372 Mon Dec 29 15:44:49 2008
+++ php-src/NEWS Tue Dec 30 19:10:59 2008
@@ -10,6 +10,7 @@
(Fixes CVE-2008-5498) (Scott)
- Fixed a segfault when malformed string is passed to json_decode(). (Scott)
+- Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL). (Ilia)
- Fixed bug #46959 (Unable to disable PCRE). (Scott)
- Fixed bug #46918 (imap_rfc822_parse_adrlist host part not filled in
correctly).
(Felipe)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
