Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit 78e04759adf1 · 2020-02-27T09:39:13.000+01:00
* PHP-7.3:
  Fix #64032: mysqli reports different client_version
diff --git a/NEWS b/NEWS
@@ -31,6 +31,9 @@ PHP                                                                        NEWS
     (Jakub Zelenka)
   . Fixed bug #79014 (PHP-FPM & Primary script unknown). (Jakub Zelenka)
 
+- 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
@@ -93,7 +93,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ static int driver_embedded_read(mysqli_object obj, zval retval, zend_bool quie`
`93`	`93`	`/* {{{ property driver_client_version_read */`
`94`	`94`	`static int driver_client_version_read(mysqli_object obj, zval retval, zend_bool quiet)`
`95`	`95`	`{`
`96`		`- ZVAL_LONG(retval, MYSQL_VERSION_ID);`
	`96`	`+ ZVAL_LONG(retval, mysql_get_client_version());`
`97`	`97`
`98`	`98`	`return SUCCESS;`
`99`	`99`	`}`