diff options
| author | Andrey Hristov <andrey@php.net> | 2010-06-18 11:56:25 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-06-18 11:56:25 +0000 |
| commit | 7f79e86886a0dee2157ddf7614a76b1a6dc34af5 (patch) | |
| tree | 283bc4bc9735b76cb43f0db8ce4dbec4bb3eca4c /ext/mysqlnd | |
| parent | 7d0eedf08c7f29bbdedd33fcc529c932c8452fbb (diff) | |
| download | php-git-7f79e86886a0dee2157ddf7614a76b1a6dc34af5.tar.gz | |
fix type mismatch, this is fresh misunderstanding
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index f169506691..8d3c0122a7 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -499,7 +499,7 @@ MYSQLND_METHOD(mysqlnd_net, encode)(zend_uchar * compress_buffer, size_t compres /* {{{ 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; diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index b5887c2f81..3975df831b 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1166,7 +1166,7 @@ php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL * result_set_memory_ 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; |