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_ps.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_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 3bc03fbe2f..461b078808 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -265,12 +265,12 @@ mysqlnd_stmt_skip_metadata(MYSQLND_STMT * s) MYSQLND_PACKET_RES_FIELD * field_packet; DBG_ENTER("mysqlnd_stmt_skip_metadata"); - if (!stmt || !stmt->conn || !stmt->conn->protocol) { + if (!stmt || !stmt->conn || !stmt->conn->payload_decoder_factory) { DBG_RETURN(FAIL); } DBG_INF_FMT("stmt=%lu", stmt->stmt_id); - field_packet = stmt->conn->protocol->m.get_result_field_packet(stmt->conn->protocol, FALSE); + field_packet = stmt->conn->payload_decoder_factory->m.get_result_field_packet(stmt->conn->payload_decoder_factory, FALSE); if (!field_packet) { SET_OOM_ERROR(*stmt->error_info); SET_OOM_ERROR(*stmt->conn->error_info); @@ -300,12 +300,12 @@ mysqlnd_stmt_read_prepare_response(MYSQLND_STMT * s) enum_func_status ret = FAIL; DBG_ENTER("mysqlnd_stmt_read_prepare_response"); - if (!stmt || !stmt->conn || !stmt->conn->protocol) { + if (!stmt || !stmt->conn || !stmt->conn->payload_decoder_factory) { DBG_RETURN(FAIL); } DBG_INF_FMT("stmt=%lu", stmt->stmt_id); - prepare_resp = stmt->conn->protocol->m.get_prepare_response_packet(stmt->conn->protocol, FALSE); + prepare_resp = stmt->conn->payload_decoder_factory->m.get_prepare_response_packet(stmt->conn->payload_decoder_factory, FALSE); if (!prepare_resp) { SET_OOM_ERROR(*stmt->error_info); SET_OOM_ERROR(*stmt->conn->error_info); @@ -344,12 +344,12 @@ mysqlnd_stmt_prepare_read_eof(MYSQLND_STMT * s) enum_func_status ret = FAIL; DBG_ENTER("mysqlnd_stmt_prepare_read_eof"); - if (!stmt || !stmt->conn || !stmt->conn->protocol) { + if (!stmt || !stmt->conn || !stmt->conn->payload_decoder_factory) { DBG_RETURN(FAIL); } DBG_INF_FMT("stmt=%lu", stmt->stmt_id); - fields_eof = stmt->conn->protocol->m.get_eof_packet(stmt->conn->protocol, FALSE); + fields_eof = stmt->conn->payload_decoder_factory->m.get_eof_packet(stmt->conn->payload_decoder_factory, FALSE); if (!fields_eof) { SET_OOM_ERROR(*stmt->error_info); SET_OOM_ERROR(*stmt->conn->error_info); |