andrey Fri, 18 Jun 2010 11:56:25 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300567
Log:
fix type mismatch, this is fresh misunderstanding
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-06-18
10:16:35 UTC (rev 300566)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-06-18
11:56:25 UTC (rev 300567)
@@ -499,7 +499,7 @@
/* {{{ mysqlnd_net::receive */
-static size_t
+static enum_func_status
MYSQLND_METHOD(mysqlnd_net, receive)(MYSQLND * conn, zend_uchar * buffer,
size_t count TSRMLS_DC)
{
size_t to_read = count;
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-06-18 10:16:35 UTC (rev 300566)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-06-18 11:56:25 UTC (rev 300567)
@@ -1166,7 +1166,7 @@
p = (*buffer)->ptr + (*data_size - header.size);
}
- if ((ret = conn->net->m.receive(conn, p, header.size
TSRMLS_CC))) {
+ if (PASS != (ret = conn->net->m.receive(conn, p, header.size
TSRMLS_CC))) {
DBG_ERR("Empty row packet body");
php_error(E_WARNING, "Empty row packet body");
break;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-06-18 10:16:35 UTC (rev
300566)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-06-18 11:56:25 UTC (rev
300567)
@@ -499,7 +499,7 @@
/* {{{ mysqlnd_net::receive */
-static size_t
+static enum_func_status
MYSQLND_METHOD(mysqlnd_net, receive)(MYSQLND * conn, zend_uchar * buffer,
size_t count TSRMLS_DC)
{
size_t to_read = count;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-06-18
10:16:35 UTC (rev 300566)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-06-18
11:56:25 UTC (rev 300567)
@@ -1166,7 +1166,7 @@
p = (*buffer)->ptr + (*data_size - header.size);
}
- if ((ret = conn->net->m.receive(conn, p, header.size
TSRMLS_CC))) {
+ if (PASS != (ret = conn->net->m.receive(conn, p, header.size
TSRMLS_CC))) {
DBG_ERR("Empty row packet body");
php_error(E_WARNING, "Empty row packet body");
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
