- Fix a warning in php_mysql.c

- Fixed #44371 Extension compile failed

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 5a41061f59a3f936a9215a4588bfd2b2db1cce11..03561760a165f474f7368b5d1dccf240be251662 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -663,7 +663,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                        client_flags ^= CLIENT_LOCAL_FILES;
                }
 
-               hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s_%d", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags);
+               hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s_%ld", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags);
        }
 
        /* We cannot use mysql_port anymore in windows, need to use

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index b61a3468485f3bc7329fffd2545b6d8e75fb987c..e11b008484999cbc9e51709426b1251718fdb8fc 100644 (file)
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -38,11 +38,11 @@
 
 #ifdef HAVE_MYSQLND
 #include "ext/mysqlnd/mysqlnd.h"
-#include "ext/mysqli/mysqli_mysqlnd.h"
+#include "mysqli_mysqlnd.h"
 #else
 #include <mysql.h>
 #include <errmsg.h>
-#include "ext/mysqli/mysqli_libmysql.h"
+#include "mysqli_libmysql.h"
 #endif
 
 #include "php_mysqli.h"