andrey Wed, 19 Jan 2011 17:51:02 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307592
Log:
fix ZTS build
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-19 17:17:52 UTC (rev
307591)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-19 17:51:02 UTC (rev
307592)
@@ -2307,7 +2307,7 @@
conn->net = mysqlnd_net_init(conn->persistent TSRMLS_CC);
conn->protocol = mysqlnd_protocol_init(conn->persistent TSRMLS_CC);
- DBG_RETURN(conn->net && conn->protocol? PASS:FAIL);
+ DBG_RETURN(conn->stats && conn->net && conn->protocol? PASS:FAIL);
}
/* }}} */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c 2011-01-19 17:17:52 UTC
(rev 307591)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c 2011-01-19 17:51:02 UTC
(rev 307592)
@@ -246,7 +246,6 @@
{
*stats = calloc(1, sizeof(MYSQLND_STATS));
if (*stats == NULL) {
- DBG_ENTER("mysqlnd_stats_init failed to calloc stats context");
return;
}
(*stats)->values = calloc(statistic_count, sizeof(uint64_t));
@@ -256,7 +255,6 @@
#ifdef ZTS
(*stats)->LOCK_access = tsrm_mutex_alloc();
#endif
-
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
