fix ZTS build

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 96ff3fbaf6efa97210993ab1b12bd6709e9824dd..8eda41374ee646b439a7ace99426d2fa83659ccc 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2307,7 +2307,7 @@ MYSQLND_METHOD(mysqlnd_conn, init)(MYSQLND * conn TSRMLS_DC)
        conn->net = mysqlnd_net_init(conn->persistent TSRMLS_CC);
        conn->protocol = mysqlnd_protocol_init(conn->persistent TSRMLS_CC);
 
-       DBG_RETURN(conn->net && conn->protocol? PASS:FAIL);
+       DBG_RETURN(conn->stats && conn->net && conn->protocol? PASS:FAIL);
 }
 /* }}} */
 

diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c
index 3098a7cfa637663ad5f8577a1712c3e2da90ea74..23683bfa87fb92f5dffeca6d5b88a71b6360dd31 100644 (file)
--- a/ext/mysqlnd/mysqlnd_statistics.c
+++ b/ext/mysqlnd/mysqlnd_statistics.c
@@ -246,7 +246,6 @@ mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count)
 {
        *stats = calloc(1, sizeof(MYSQLND_STATS));
        if (*stats == NULL) {
-               DBG_ENTER("mysqlnd_stats_init failed to calloc stats context");
                return;
        }
        (*stats)->values = calloc(statistic_count, sizeof(uint64_t));
@@ -256,7 +255,6 @@ mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count)
 #ifdef ZTS
        (*stats)->LOCK_access = tsrm_mutex_alloc();
 #endif
-
 }
 /* }}} */