fix type mismatch, this is fresh misunderstanding

diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index f1695066913c2de6b285738f2236e9b699266f20..8d3c0122a7c8de9d6442fab893eb07cda56412f7 100644 (file)
--- 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 b5887c2f81a4f74c2f8cbdbcdf7ddedba38f55ac..3975df831b0d32f3b58c2413518cf81bbb29647d 100644 (file)
--- 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;