com php-src: Fix wrong macro name: ext/mysqlnd/mysqlnd.h ext/mysqlnd/mysqlnd_connection.c
| From: | Andrey Hristov | Date: | Wed, 18 Nov 2015 09:35:10 +0000 |
| Subject: | com php-src: Fix wrong macro name: ext/mysqlnd/mysqlnd.h ext/mysqlnd/mysqlnd_connection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89897@lists.php.net to get a copy of this message | ||
Commit: b7b4364269d0f82a25e4448917f65ec45f951ffe
Author: Andrey Hristov <andrey@php.net> Wed, 18 Nov 2015 10:35:10 +0100
Parents: ee396aa56650b93578c4404ccff6471cc3072daa
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b7b4364269d0f82a25e4448917f65ec45f951ffe
Log:
Fix wrong macro name
Changed paths:
M ext/mysqlnd/mysqlnd.h
M ext/mysqlnd/mysqlnd_connection.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index c2585b1..42a0285 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -267,7 +267,7 @@ PHPAPI void _mysqlnd_get_client_stats(MYSQLND_STATS * stats, zval *return_valu
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
MYSQLND_INC_STATISTIC(MYSQLND_G(collect_statistics), mysqlnd_global_stats, (statistic))
-#define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) \
+#define MYSQLND_DEC_GLOBAL_STATISTIC(statistic) \
MYSQLND_DEC_STATISTIC(MYSQLND_G(collect_statistics), mysqlnd_global_stats, (statistic))
#define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c
index 0520b76..3212164 100644
--- a/ext/mysqlnd/mysqlnd_connection.c
+++ b/ext/mysqlnd/mysqlnd_connection.c
@@ -1259,9 +1259,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_close)(MYSQLND_CONN_DATA * const conn)
DBG_INF_FMT("state=%u", state);
if (state >= CONN_READY) {
- MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_CONNECTIONS);
+ MYSQLND_DEC_GLOBAL_STATISTIC(STAT_OPENED_CONNECTIONS);
if (conn->persistent) {
- MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_PERSISTENT_CONNECTIONS);
+ MYSQLND_DEC_GLOBAL_STATISTIC(STAT_OPENED_PERSISTENT_CONNECTIONS);
}
}
switch (state) {