From 132ad2d26c6fd245c54f4e2fda94dc8bed7a10f1 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 30 Dec 2008 19:10:59 +0000 Subject: [PATCH] Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL). --- NEWS | 1 + ext/pdo_mysql/mysql_driver.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 5a7f651541..0fbd1d1055 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ PHP NEWS (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) diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index e59388bf8f..b23a06b473 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -496,12 +496,12 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ 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 */ -- 2.40.0