com php-src: MNDR: - remove double decrement: ext/mysqlnd/mysqlnd.c

From: Date: Thu, 12 Nov 2015 15:19:16 +0000
Subject: com php-src: MNDR: - remove double decrement: ext/mysqlnd/mysqlnd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89790@lists.php.net to get a copy of this message
Commit: 51085dac1a718f43939f83baed133cabac87e51a Author: Andrey Hristov <andrey@php.net> Thu, 5 Nov 2015 15:43:10 +0100 Parents: b8b1d45c3c9b5ceba2e3a12108c84e122e2e20b1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51085dac1a718f43939f83baed133cabac87e51a Log: MNDR: - remove double decrement Changed paths: M ext/mysqlnd/mysqlnd.c Diff: diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 80ca681..ad791b7 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -753,7 +753,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, hostname.s?hostname.s:"", username.s?username.s:"", database.s?database.s:"", port, mysql_flags, conn? conn->persistent:0, conn? GET_CONNECTION_STATE(&conn->state):-1); - if (GET_CONNECTION_STATE(&conn->state) > CONN_ALLOCED && GET_CONNECTION_STATE(&conn->state) ) { + if (GET_CONNECTION_STATE(&conn->state) > CONN_ALLOCED) { DBG_INF("Connecting on a connected handle."); if (GET_CONNECTION_STATE(&conn->state) < CONN_QUIT_SENT) { @@ -763,10 +763,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, } conn->m->free_contents(conn); - MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_CONNECTIONS); - if (conn->persistent) { - MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_PERSISTENT_CONNECTIONS); - } /* Now reconnect using the same handle */ if (net->data->compressed) { /*

« previous php.cvs (#89790) next »