From f7a445856dc6abcf7bca13377ea94ab474681874 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Fri, 30 Oct 2015 14:31:12 +0100 Subject: MNDR: - pass connection closer and its context - remove unused parameter --- ext/mysqlnd/mysqlnd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ext/mysqlnd/mysqlnd.c') diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 3af0da8785..15f399956c 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1936,14 +1936,15 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_close)(MYSQLND_CONN_DATA * const conn) DBG_ENTER("mysqlnd_send_close"); DBG_INF_FMT("conn=%llu net->data->stream->abstract=%p", conn->thread_id, net_stream? net_stream->abstract:NULL); - if (GET_CONNECTION_STATE(&conn->state) >= CONN_READY) { + state = GET_CONNECTION_STATE(&conn->state); + DBG_INF_FMT("state=%u", state); + + if (state >= CONN_READY) { MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_CONNECTIONS); if (conn->persistent) { MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_PERSISTENT_CONNECTIONS); } } - state = GET_CONNECTION_STATE(&conn->state); - DBG_INF_FMT("state=%u", state); switch (state) { case CONN_READY: DBG_INF("Connection clean, sending COM_QUIT"); -- cgit v1.2.1