diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:32:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:32:01 +0200 |
| commit | d591e1c4f5114cd5ebf3a68ea07741b0bd598e7f (patch) | |
| tree | 94857e5c1d6e6b8a531d673915ffd207a3e3c1f4 /ext/mysqli/mysqli.c | |
| parent | f0d2efbadcab95596679e2f78e204299c96ad9b4 (diff) | |
| parent | 1aab7db6c870441046007c792c7fc5ecdff2ea51 (diff) | |
| download | php-git-d591e1c4f5114cd5ebf3a68ea07741b0bd598e7f.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
pdo_mysql/mysqli (native) libmysqlclient_r no-longer used
mysql: native mysql-8.0 uses _Bool
mysqli: use native api
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index dc2e0e7e33..dcc5a16d5e 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -699,7 +699,7 @@ PHP_MINIT_FUNCTION(mysqli) #ifdef MYSQLND_STRING_TO_INT_CONVERSION REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT); #endif -#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND) +#if (MYSQL_VERSION_ID > 50110 && MYSQL_VERSION_ID < 80000) || (MYSQL_VERSION_ID >= 100000) || defined(MYSQLI_USE_MYSQLND) REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT); #endif |