Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL).

diff --git a/NEWS b/NEWS
index 5a7f6515416b45d1fbd931d9518921acf6234aa5..0fbd1d105512a85b7f10e532cac35d5afe30060c 100644 (file)
--- 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 e59388bf8f79514fe16e3f8abd82bc9b90296b77..b23a06b4731f2f2abb7612c30c9d074395779c1f 100755 (executable)
--- 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 */