71 lines
2.8 KiB
Diff
71 lines
2.8 KiB
Diff
diff -up php-7.2.4/ext/mysqli/mysqli_api.c.omv~ php-7.2.4/ext/mysqli/mysqli_api.c
|
|
--- php-7.2.4/ext/mysqli/mysqli_api.c.omv~ 2018-04-06 21:50:05.183703414 +0200
|
|
+++ php-7.2.4/ext/mysqli/mysqli_api.c 2018-04-06 21:50:16.436829372 +0200
|
|
@@ -616,7 +616,7 @@ PHP_FUNCTION(mysqli_change_user)
|
|
size_t user_len, password_len, dbname_len;
|
|
zend_ulong rc;
|
|
#if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET)
|
|
- const CHARSET_INFO * old_charset;
|
|
+ const MY_CHARSET_INFO * old_charset;
|
|
#endif
|
|
|
|
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss!", &mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, &dbname, &dbname_len) == FAILURE) {
|
|
diff -up php-7.2.4/ext/mysqli/mysqli.c.omv~ php-7.2.4/ext/mysqli/mysqli.c
|
|
--- php-7.2.4/ext/mysqli/mysqli.c.omv~ 2018-04-06 21:49:41.782434506 +0200
|
|
+++ php-7.2.4/ext/mysqli/mysqli.c 2018-04-06 21:49:52.708561249 +0200
|
|
@@ -26,6 +26,7 @@
|
|
|
|
#include <signal.h>
|
|
|
|
+#include <server/mysql_version.h>
|
|
#include "php.h"
|
|
#include "php_ini.h"
|
|
#include "ext/standard/info.h"
|
|
diff -up php-7.2.4/ext/mysqli/mysqli_nonapi.c.omv~ php-7.2.4/ext/mysqli/mysqli_nonapi.c
|
|
--- php-7.2.4/ext/mysqli/mysqli_nonapi.c.omv~ 2018-04-06 21:51:43.217399945 +0200
|
|
+++ php-7.2.4/ext/mysqli/mysqli_nonapi.c 2018-04-06 21:58:52.799445824 +0200
|
|
@@ -263,7 +263,7 @@ void mysqli_common_connect(INTERNAL_FUNC
|
|
php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql));
|
|
|
|
#if !defined(MYSQLI_USE_MYSQLND)
|
|
- mysql->mysql->reconnect = MyG(reconnect);
|
|
+/* mysql->mysql->reconnect = MyG(reconnect); */
|
|
#endif
|
|
|
|
mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&MyG(allow_local_infile));
|
|
diff -up php-7.2.4/ext/mysqli/mysqli_prop.c.omv~ php-7.2.4/ext/mysqli/mysqli_prop.c
|
|
--- php-7.2.4/ext/mysqli/mysqli_prop.c.omv~ 2018-04-06 21:50:25.687842714 +0200
|
|
+++ php-7.2.4/ext/mysqli/mysqli_prop.c 2018-04-06 21:50:35.116768902 +0200
|
|
@@ -23,6 +23,7 @@
|
|
|
|
#include <signal.h>
|
|
|
|
+#include <server/mysql_version.h>
|
|
#include "php.h"
|
|
#include "php_ini.h"
|
|
#include "ext/standard/info.h"
|
|
diff -up php-7.2.4/ext/mysqli/php_mysqli_structs.h.omv~ php-7.2.4/ext/mysqli/php_mysqli_structs.h
|
|
--- php-7.2.4/ext/mysqli/php_mysqli_structs.h.omv~ 2018-04-06 21:49:12.161080045 +0200
|
|
+++ php-7.2.4/ext/mysqli/php_mysqli_structs.h 2018-04-06 21:58:44.599503172 +0200
|
|
@@ -79,11 +79,7 @@
|
|
#include <my_sys.h>
|
|
#include <mysql.h>
|
|
#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 */
|
|
|
|
@@ -326,7 +322,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
|
|
char *default_user;
|
|
char *default_socket;
|
|
char *default_pw;
|
|
- zend_long reconnect;
|
|
+/* zend_long reconnect; */
|
|
zend_long allow_local_infile;
|
|
zend_long strict;
|
|
zend_long error_no;
|