mysql: native mysql-8.0 uses _Bool

MySQL-8.0 removes option MYSQLI_OPT_SSL_VERIFY_SERVER_CERT

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 73511b26393c6d6af10bdd0d4d62deb3d07ce67a..bdab4b7d1e57c448d70a37a13fda5b2364a38902 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -686,7 +686,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
 

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index e399ecaa36afc08be8935256a2e46628b6ab5156..143acbd5a10ed382b3d8a4533edb86647611e566 100644 (file)
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -67,8 +67,8 @@
 #endif
 
 #include <mysql.h>
-#ifndef my_bool
-typedef char           my_bool;
+#if MYSQL_VERSION_ID >= 80000 &&  MYSQL_VERSION_ID < 100000
+typedef _Bool          my_bool;
 #endif
 #include <errmsg.h>
 #include <mysqld_error.h>

diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index 486780acdcc8dbdcc183483134edb789539b4955..e7cabeeb15fa77dbab3f1d6284ccedf5bcade08e 100644 (file)
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -27,6 +27,9 @@
 #      define PDO_MYSQL_PARAM_BIND MYSQLND_PARAM_BIND
 #else
 #      include <mysql.h>
+#if MYSQL_VERSION_ID >= 80000 &&  MYSQL_VERSION_ID < 100000
+typedef _Bool       my_bool;
+#endif
 #      define PDO_MYSQL_PARAM_BIND MYSQL_BIND
 #endif