diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-08-29 17:18:57 +1000 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:27:31 +0200 |
| commit | 202a0697f3f1771f241e7dadbe1ecbb8cb72b6c9 (patch) | |
| tree | c472fbea6456b3c70ef05f7ad45a5ce0c0c1bc9f /ext/mysqli/php_mysqli_structs.h | |
| parent | efc52f1754524327facffc9f7eea72560e1c03e9 (diff) | |
| download | php-git-202a0697f3f1771f241e7dadbe1ecbb8cb72b6c9.tar.gz | |
mysqli: use native api
Tested with:
* mysql-5.6.49-linux-glibc2.12-x86_64
* mysql-5.7.31-linux-glibc2.12-x86_64
* mysql-8.0.21-linux-glibc2.17-x86_64
* mariadb-10.5.6
configure --with-mysqli=/usr/local/$version/bin/mysql_config --with-pdo-mysql=/usr/local/$version
MySQL-8.0 removed my_bool
Some options where deprecated in mysql-8.0
MY_CHARSET_INFO used with exposed api mysql_get_character_set_info
rather than internal structures.
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 1b7ffddb1a..e399ecaa36 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -58,8 +58,6 @@ #define HAVE_ULONG #endif -#include <my_global.h> - #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) #define HAVE_MBRLEN 1 #endif @@ -68,20 +66,12 @@ #define HAVE_MBSTATE_T 1 #endif -/* - We need more than mysql.h because we need CHARSET_INFO in one place. - This order has been borrowed from the ODBC driver. Nothing can be removed - from the list of headers :( -*/ - -#include <my_sys.h> #include <mysql.h> +#ifndef my_bool +typedef char my_bool; +#endif #include <errmsg.h> -#include <my_list.h> -#include <m_string.h> #include <mysqld_error.h> -#include <my_list.h> -#include <m_ctype.h> #include "mysqli_libmysql.h" #endif /* MYSQLI_USE_MYSQLND */ |