diff options
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 96ff3fbaf6..8eda41374e 100644 --- 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 3098a7cfa6..23683bfa87 100644 --- 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 - } /* }}} */ |