andrey Fri May 29 08:05:21 2009 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd_statistics.h
Log:
Fix a very well hidden error because of not being careful with CPP.
I usually don't make this mistake :)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.12
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.13
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.12 Wed Dec 31 11:12:33 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.h Fri May 29 08:05:21 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_statistics.h,v 1.12 2008/12/31 11:12:33 sebastian Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.13 2009/05/29 08:05:21 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
@@ -38,8 +38,8 @@
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
- DBG_INF_FMT("Global stat increase [%s]",
mysqlnd_stats_values_names[statistic]); \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
+ DBG_INF_FMT("Global stat increase [%s]",
mysqlnd_stats_values_names[(statistic)]); \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)]++; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -48,8 +48,8 @@
#define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
- DBG_INF_FMT("Global&conn stat decrease [%s]",
mysqlnd_stats_values_names[statistic]); \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
+ DBG_INF_FMT("Global&conn stat decrease [%s]",
mysqlnd_stats_values_names[(statistic)]); \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)]--; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -64,7 +64,7 @@
if (MYSQLND_G(collect_statistics)) { \
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
- DBG_INF_FMT("Global stat increase [%s] [%s]",
mysqlnd_stats_values_names[statistic1],
mysqlnd_stats_values_names[statistic2]); \
+ DBG_INF_FMT("Global stat increase [%s] [%s]",
mysqlnd_stats_values_names[(statistic1)],
mysqlnd_stats_values_names[(statistic2)]); \
\
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
if (statistic1 != STAT_LAST)
mysqlnd_global_stats->values[(statistic1)]+= v1; \
@@ -75,8 +75,8 @@
#define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
- DBG_INF_FMT("Global&Conn stat increase [%s]",
mysqlnd_stats_values_names[statistic]); \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
+ DBG_INF_FMT("Global&Conn stat increase [%s]",
mysqlnd_stats_values_names[(statistic)]); \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)]++; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -88,9 +88,9 @@
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
uint64_t v = (uint64_t) (value); \
- DBG_INF_FMT("Global&Conn stat increase w value [%s]",
mysqlnd_stats_values_names[statistic]); \
+ DBG_INF_FMT("Global&Conn stat increase w value [%s]",
mysqlnd_stats_values_names[(statistic)]); \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)] += v; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -143,8 +143,8 @@
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
- DBG_INF_FMT("Global stat increase [%s]",
mysqlnd_stats_values_names[statistic]); \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
+ DBG_INF_FMT("Global stat increase [%s]",
mysqlnd_stats_values_names[(statistic)]); \
mysqlnd_global_stats->values[(statistic)]++; \
} \
}
@@ -152,8 +152,8 @@
#define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
- DBG_INF_FMT("Global&Conn stat decrease [%s]",
mysqlnd_stats_values_names[statistic]); \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
+ DBG_INF_FMT("Global&Conn stat decrease [%s]",
mysqlnd_stats_values_names[(statistic)]); \
mysqlnd_global_stats->values[(statistic)]--; \
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)]--; \
@@ -166,7 +166,7 @@
if (MYSQLND_G(collect_statistics)) { \
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
- DBG_INF_FMT("Global stat increase [%s] [%s]",
mysqlnd_stats_values_names[statistic1],
mysqlnd_stats_values_names[statistic2]); \
+ DBG_INF_FMT("Global stat increase [%s] [%s]",
mysqlnd_stats_values_names[(statistic1)],
mysqlnd_stats_values_names[(statistic2)]); \
\
if (statistic1 != STAT_LAST)
mysqlnd_global_stats->values[(statistic1)]+= v1; \
if (statistic2 != STAT_LAST)
mysqlnd_global_stats->values[(statistic2)]+= v2; \
@@ -175,8 +175,8 @@
#define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
- DBG_INF_FMT("Global&Conn stat increase [%s]",
mysqlnd_stats_values_names[statistic]); \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
+ DBG_INF_FMT("Global&Conn stat increase [%s]",
mysqlnd_stats_values_names[(statistic)]); \
mysqlnd_global_stats->values[(statistic)]++; \
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)]++; \
@@ -186,9 +186,9 @@
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \
{ \
- if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
+ if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
uint64_t v = (uint64_t) (value); \
- DBG_INF_FMT("Global&Conn stats increase w value [%s]",
mysqlnd_stats_values_names[statistic]); \
+ DBG_INF_FMT("Global&Conn stats increase w value [%s]",
mysqlnd_stats_values_names[(statistic)]); \
mysqlnd_global_stats->values[(statistic)] += v; \
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)] +=
v; \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
