diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-30 14:31:12 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | f7a445856dc6abcf7bca13377ea94ab474681874 (patch) | |
| tree | 356844cadfe2b5e8cf7f83ec0ccf9e76a16db659 /ext/mysqlnd/mysqlnd.c | |
| parent | 280c834c49284eb0e5f284e1f24453dbeb0c8a79 (diff) | |
| download | php-git-f7a445856dc6abcf7bca13377ea94ab474681874.tar.gz | |
MNDR:
- pass connection closer and its context
- remove unused parameter
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 7 |
1 files changed, 4 insertions, 3 deletions
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"); |