diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-27 09:38:55 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-27 09:39:13 +0100 |
| commit | 78e04759adf1b2f832d875afffc37fa59e363dfa (patch) | |
| tree | 4ba72ad6cc889698dedd0472c981a7a120e72fe1 | |
| parent | 8c8f8c419378822f336aab13f301519cf2b95feb (diff) | |
| parent | 8654c32b584d448cbf9f341693b227db193fe155 (diff) | |
| download | php-git-78e04759adf1b2f832d875afffc37fa59e363dfa.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #64032: mysqli reports different client_version
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_driver.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 index 3e21534dd9..a54f4dc46b 100644 --- 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; } |