- fix build, come on, it is not that hard to test before commit, is it?

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index b9bf3b2de03dae94eff1f9b8090babc7f8f675da..ab801cfccf0ebbbabcad01a94eec9ca1f0a48613 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -2319,8 +2319,10 @@ mysqlnd_net_init(zend_bool persistent TSRMLS_DC)
 void
 mysqlnd_net_free(MYSQLND_NET * net TSRMLS_DC)
 {
-       DBG_ENTER("mysqlnd_net_free");
        zend_bool pers = net->persistent;
+
+       DBG_ENTER("mysqlnd_net_free");
+
        if (net) {
                if (net->cmd_buffer.buffer) {
                        DBG_INF("Freeing cmd buffer");

diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index 1f9f05ce54ce5e05bd83cfe13be3810f6359f5ee..0ee285f8f132463aabf93c51845392b9e00fee8c 100755 (executable)
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -70,6 +70,12 @@ ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql)
        char          *debug; /* The actual string */
        MYSQLND_DEBUG *dbg;     /* The DBG object */
 #endif
+#if defined(PHP_WIN32) && !PDO_DBG_ENABLED
+       /* dummy member so we get at least one member in the struct
+        * and avoids build errors.
+        */
+       void *dummymemmber;
+#endif
 ZEND_END_MODULE_GLOBALS(pdo_mysql)
 
 ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql);