diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-02 15:30:53 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | 34a33928d649c69859c6b368f5fa35a8d37d7b2c (patch) | |
| tree | 14a115afe44e8bc2ca7679fea31b91eb6d1eedf8 /ext/mysqlnd/mysqlnd_result.c | |
| parent | 4c83582c74f1a553e19635d0b2880d5120fde5ef (diff) | |
| download | php-git-34a33928d649c69859c6b368f5fa35a8d37d7b2c.tar.gz | |
MNDR:
- Rename MYSQLND_PROTOCOL to MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY
- Rename other symbols related to MYSQLND_PROTOCOL accordingly
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 4208097cf7..bee0a1da88 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -411,7 +411,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s) ret = FAIL; do { - rset_header = conn->protocol->m.get_rset_header_packet(conn->protocol, FALSE); + rset_header = conn->payload_decoder_factory->m.get_rset_header_packet(conn->payload_decoder_factory, FALSE); if (!rset_header) { SET_OOM_ERROR(*conn->error_info); ret = FAIL; @@ -542,7 +542,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s) } /* Check for SERVER_STATUS_MORE_RESULTS if needed */ - fields_eof = conn->protocol->m.get_eof_packet(conn->protocol, FALSE); + fields_eof = conn->payload_decoder_factory->m.get_eof_packet(conn->payload_decoder_factory, FALSE); if (!fields_eof) { SET_OOM_ERROR(*conn->error_info); ret = FAIL; @@ -944,7 +944,7 @@ MYSQLND_METHOD(mysqlnd_res, use_result)(MYSQLND_RES * const result, zend_bool ps this to be not NULL. */ /* FALSE = non-persistent */ - result->unbuf->row_packet = result->conn->protocol->m.get_row_packet(result->conn->protocol, FALSE); + result->unbuf->row_packet = result->conn->payload_decoder_factory->m.get_row_packet(result->conn->payload_decoder_factory, FALSE); if (!result->unbuf->row_packet) { goto oom; } @@ -1295,7 +1295,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c set->references = 1; /* non-persistent */ - row_packet = conn->protocol->m.get_row_packet(conn->protocol, FALSE); + row_packet = conn->payload_decoder_factory->m.get_row_packet(conn->payload_decoder_factory, FALSE); if (!row_packet) { SET_OOM_ERROR(*conn->error_info); ret = FAIL; |