diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-27 09:40:31 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-27 09:40:31 +0100 |
| commit | 30d18b8ced8d624aea29e882cc3422ce0a416fc1 (patch) | |
| tree | 54acf20ca9cce7341310dee68934364cb88d6f69 /ext/mysqli/mysqli_driver.c | |
| parent | a51c98e69628f15d8c8b66b5a77974470efc4ff7 (diff) | |
| parent | 78e04759adf1b2f832d875afffc37fa59e363dfa (diff) | |
| download | php-git-30d18b8ced8d624aea29e882cc3422ce0a416fc1.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #64032: mysqli reports different client_version
Diffstat (limited to 'ext/mysqli/mysqli_driver.c')
| -rw-r--r-- | ext/mysqli/mysqli_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c index f63d699f60..d0cc505cbf 100644 --- a/ext/mysqli/mysqli_driver.c +++ b/ext/mysqli/mysqli_driver.c @@ -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; } |