]> granicus.if.org Git - php/commitdiff
MNDR:
authorAndrey Hristov <andrey@php.net>
Thu, 5 Nov 2015 14:43:10 +0000 (15:43 +0100)
committerAndrey Hristov <andrey@php.net>
Thu, 12 Nov 2015 15:19:16 +0000 (16:19 +0100)
- remove double decrement

ext/mysqlnd/mysqlnd.c

index 80ca681ea0a64b491511d97009178da6ba31a317..ad791b70fe772346480c68702e7bcfb7018538d5 100644 (file)
@@ -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) {
                        /*