diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:35:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:35:03 +0200 |
| commit | 3ad57f9f315f0d1dabcb75d18eff60e835b2ff63 (patch) | |
| tree | 4a9c7f987812d07a0acbb02787ce40c9a8c2a596 /ext/mysqli/mysqli.c | |
| parent | 8d37c37bcdbf6fa99cd275413342457eeb2c664e (diff) | |
| parent | d591e1c4f5114cd5ebf3a68ea07741b0bd598e7f (diff) | |
| download | php-git-3ad57f9f315f0d1dabcb75d18eff60e835b2ff63.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
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 e056ceba2d..7d47ef0756 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -659,7 +659,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 |