Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #64032: mysqli reports different client_version
This commit is contained in:
Christoph M. Becker 2020-02-27 09:40:31 +01:00
commit 30d18b8ced

View file

@ -91,7 +91,7 @@ static int driver_embedded_read(mysqli_object *obj, zval *retval, zend_bool quie
/* {{{ property driver_client_version_read */
static int driver_client_version_read(mysqli_object *obj, zval *retval, zend_bool quiet)
{
ZVAL_LONG(retval, MYSQL_VERSION_ID);
ZVAL_LONG(retval, mysql_get_client_version());
return SUCCESS;
}