mysqlnd fixes for Windows :

- less warnings
- PHPAPI for mysqlnd_poll

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index b0c44748a20dd325401213ac61521c28dcfb61ae..c62d73138846e9a1c12e1524d5269314a47dbe92 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1382,7 +1382,7 @@ MYSQLND_METHOD(mysqlnd_conn, set_charset)(MYSQLND * const conn, const char * con
 
 /* {{{ mysqlnd_conn::refresh */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, refresh)(MYSQLND * const conn, unsigned long options TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, refresh)(MYSQLND * const conn, uint8_t options TSRMLS_DC)
 {
        zend_uchar bits[1];
        DBG_ENTER("mysqlnd_conn::refresh");
@@ -1397,7 +1397,7 @@ MYSQLND_METHOD(mysqlnd_conn, refresh)(MYSQLND * const conn, unsigned long option
 
 /* {{{ mysqlnd_conn::shutdown */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, shutdown)(MYSQLND * const conn, unsigned long level TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, shutdown)(MYSQLND * const conn, uint8_t level TSRMLS_DC)
 {
        zend_uchar bits[1];
        DBG_ENTER("mysqlnd_conn::shutdown");

diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index 9f34fe0cc241666582429fc5973837c7dc9a8dd4..a8d02119247df498fde8b4e51f0f512e68aef713 100644 (file)
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -111,7 +111,7 @@ PHPAPI void _mysqlnd_debug(const char *mode TSRMLS_DC);
 #define mysqlnd_reap_async_query(conn)                                 (conn)->m->reap_query((conn) TSRMLS_CC)
 #define mysqlnd_unbuffered_skip_result(result)                 (result)->m.skip_result((result) TSRMLS_CC)
 
-enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, uint * desc_num TSRMLS_DC);
+PHPAPI enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, uint * desc_num TSRMLS_DC);
 
 #define mysqlnd_use_result(conn)               (conn)->m->use_result((conn) TSRMLS_CC)
 #define mysqlnd_store_result(conn)             (conn)->m->store_result((conn) TSRMLS_CC)

diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index 789d1fac1a17c889c31199b8e700adc5727f2b35..58b11e34aa9d16cb962d9e2d36ddf0a5d448a633 100644 (file)
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -92,13 +92,13 @@ char *      mysqlnd_get_backtrace(TSRMLS_D);
 #elif MYSQLND_DBG_ENABLED == 0
 
 
-static inline void DBG_INF(char *msg) {}
-static inline void DBG_ERR(char *msg) {}
-static inline void DBG_INF_FMT(char *format, ...) {}
-static inline void DBG_ERR_FMT(char *format, ...) {}
-static inline void DBG_ENTER(char *func_name) {}
+static inline void DBG_INF(const char * const msg) {}
+static inline void DBG_ERR(const char * const msg) {}
+static inline void DBG_INF_FMT(const char * const format, ...) {}
+static inline void DBG_ERR_FMT(const char * const format, ...) {}
+static inline void DBG_ENTER(const char * const func_name) {}
 #define DBG_RETURN(value)      return (value)
-#define DBG_VOID_RETURN                return;
+#define DBG_VOID_RETURN                return
 #endif
 
 

diff --git a/ext/mysqlnd/mysqlnd_palloc.c b/ext/mysqlnd/mysqlnd_palloc.c
index f64dd17ada7a7db931fbca8159e30a702c7632b0..1d72dcd634d75b587ac2299b503f1912bc4d5334 100644 (file)
--- a/ext/mysqlnd/mysqlnd_palloc.c
+++ b/ext/mysqlnd/mysqlnd_palloc.c
@@ -492,7 +492,7 @@ void mysqlnd_palloc_zval_ptr_dtor(zval **zv, MYSQLND_THD_ZVAL_PCACHE * const thd
                                        thd_cache->gc_list.last_added,
                                        *thd_cache->gc_list.last_added,
                                        cache->free_list.canary1, cache->free_list.canary2);
-               if ((thd_cache->gc_list.last_added - thd_cache->gc_list.ptr_line) > cache->max_items) {
+               if ((thd_cache->gc_list.last_added - thd_cache->gc_list.ptr_line) > (int) cache->max_items) {
                        DBG_ERR("Buffer overflow follows");
                        DBG_ERR_FMT("parent->max_items=%d parent->free_items=%d diff=%d",
                                                cache->max_items, cache->free_items,

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 415a8fb00ca6c275c43035909dfea8a5e706ce72..78cdd8e74c267043fd1605ab14cddc23415a868c 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -866,7 +866,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int
                                                        || Z_TYPE_P(data) == IS_UNICODE
 #endif
                                                        )
-                                                        && (result->meta->fields[i].max_length < Z_STRLEN_P(data)))
+                                                        && (result->meta->fields[i].max_length < (unsigned long) Z_STRLEN_P(data)))
                                                {
                                                        result->meta->fields[i].max_length = Z_STRLEN_P(data);
                                                }
@@ -1034,7 +1034,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla
                                                        || Z_TYPE_P(data) == IS_UNICODE
 #endif
                                                        )
-                                                        && (result->meta->fields[i].max_length < Z_STRLEN_P(data)))
+                                                        && (result->meta->fields[i].max_length < (unsigned long) Z_STRLEN_P(data)))
                                                {
                                                        result->meta->fields[i].max_length = Z_STRLEN_P(data);
                                                }

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index ffeda103d0a8f696a374b981cddb1cc49d99899b..3343da5a501e2cd4be19fa92addaa3f68f217479 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -247,8 +247,8 @@ struct st_mysqlnd_conn_methods
 
        MYSQLND_STMT *          (*stmt_init)(MYSQLND * const conn TSRMLS_DC);
 
-       enum_func_status        (*shutdown_server)(MYSQLND * const conn, unsigned long level TSRMLS_DC);
-       enum_func_status        (*refresh_server)(MYSQLND * const conn, unsigned long options TSRMLS_DC);
+       enum_func_status        (*shutdown_server)(MYSQLND * const conn, uint8_t level TSRMLS_DC);
+       enum_func_status        (*refresh_server)(MYSQLND * const conn, uint8_t options TSRMLS_DC);
 
        enum_func_status        (*ping)(MYSQLND * const conn TSRMLS_DC);
        enum_func_status        (*kill_connection)(MYSQLND *conn, unsigned int pid TSRMLS_DC);