summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--ext/mysqli/mysqli_driver.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 12208cf46a..353f7b0a13 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,9 @@ PHP NEWS
cmb)
. Fixed bug #79271 (DOMDocumentType::$childNodes is NULL). (cmb)
+- MySQLi:
+ . Fixed bug #64032 (mysqli reports different client_version). (cmb)
+
- PCRE:
. Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback
and unicode). (Nikita)
diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
index 019e902391..3464fccbc7 100644
--- a/ext/mysqli/mysqli_driver.c
+++ b/ext/mysqli/mysqli_driver.c
@@ -96,7 +96,7 @@ static zval *driver_embedded_read(mysqli_object *obj, zval *retval)
/* {{{ property driver_client_version_read */
static zval *driver_client_version_read(mysqli_object *obj, zval *retval)
{
- ZVAL_LONG(retval, MYSQL_VERSION_ID);
+ ZVAL_LONG(retval, mysql_get_client_version());
return retval;
}
/* }}} */