Fix mysqlnd warnings

diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index 1e6d0c17a6b03bb689a6552e5e93c8d0cf63cb83..1a571435076396873b21e54f2db2dccc38dcbb3b 100644 (file)
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -115,6 +115,7 @@ PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[]);
                                        struct timeval __dbg_prof_tp = {0}; \
                                        uint64_t __dbg_prof_start = 0; /* initialization is needed */ \
                                        zend_bool dbg_skip_trace = TRUE; \
+                                       ((void)__dbg_prof_start); \
                                        if ((dbg_obj1)) { \
                                                dbg_skip_trace = !(dbg_obj1)->m->func_enter((dbg_obj1), __LINE__, __FILE__, func_name, strlen(func_name)); \
                                        } \

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 70e0cf3d55f22b1f49f137533dbaa09af278bd4a..0923a988ed24287eef8d3001bbe893b48bc9bbbe 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -582,9 +582,8 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn)
 
                        {
                                zend_string * key;
-                               zend_ulong unused_num_key;
                                zval * entry_value;
-                               ZEND_HASH_FOREACH_KEY_VAL(packet->connect_attr, unused_num_key, key, entry_value) {
+                               ZEND_HASH_FOREACH_STR_KEY_VAL(packet->connect_attr, key, entry_value) {
                                        if (key) { /* HASH_KEY_IS_STRING */
                                                size_t value_len = Z_STRLEN_P(entry_value);
 
@@ -621,9 +620,8 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn)
 #else
                                {
                                        zend_string * key;
-                                       zend_ulong unused_num_key;
                                        zval * entry_value;
-                                       ZEND_HASH_FOREACH_KEY_VAL(packet->connect_attr, unused_num_key, key, entry_value) {
+                                       ZEND_HASH_FOREACH_STR_KEY_VAL(packet->connect_attr, key, entry_value) {
                                                if (key) { /* HASH_KEY_IS_STRING */
                                                        size_t value_len = Z_STRLEN_P(entry_value);