Skip to content

Commit 34a3392

Browse files
faizshukrifaizshukri
committed
MNDR:
- Rename MYSQLND_PROTOCOL to MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY - Rename other symbols related to MYSQLND_PROTOCOL accordingly
1 parent 4c83582 commit 34a3392

12 files changed

+119
-119
lines changed

‎ext/mysqlnd/mysqlnd.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, dtor)(MYSQLND_CONN_DATA * conn)
193193
conn->net = NULL;
194194
}
195195

196-
if (conn->protocol) {
197-
mysqlnd_protocol_free(conn->protocol);
198-
conn->protocol = NULL;
196+
if (conn->payload_decoder_factory) {
197+
mysqlnd_protocol_payload_decoder_factory_free(conn->payload_decoder_factory);
198+
conn->payload_decoder_factory = NULL;
199199
}
200200

201201
if (conn->stats) {
@@ -222,7 +222,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_command_handle_response)(MYSQLND_CONN_DAT
222222

223223
switch (ok_packet) {
224224
case PROT_OK_PACKET:{
225-
MYSQLND_PACKET_OK * ok_response = conn->protocol->m.get_ok_packet(conn->protocol, FALSE);
225+
MYSQLND_PACKET_OK * ok_response = conn->payload_decoder_factory->m.get_ok_packet(conn->payload_decoder_factory, FALSE);
226226
if (!ok_response) {
227227
SET_OOM_ERROR(*conn->error_info);
228228
break;
@@ -268,7 +268,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_command_handle_response)(MYSQLND_CONN_DAT
268268
break;
269269
}
270270
case PROT_EOF_PACKET:{
271-
MYSQLND_PACKET_EOF * ok_response = conn->protocol->m.get_eof_packet(conn->protocol, FALSE);
271+
MYSQLND_PACKET_EOF * ok_response = conn->payload_decoder_factory->m.get_eof_packet(conn->payload_decoder_factory, FALSE);
272272
if (!ok_response) {
273273
SET_OOM_ERROR(*conn->error_info);
274274
break;
@@ -338,7 +338,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_command_do_request)(MYSQLND_CONN_DATA * c
338338
SET_ERROR_AFF_ROWS(conn);
339339
SET_EMPTY_ERROR(*conn->error_info);
340340

341-
cmd_packet = conn->protocol->m.get_command_packet(conn->protocol, FALSE);
341+
cmd_packet = conn->payload_decoder_factory->m.get_command_packet(conn->payload_decoder_factory, FALSE);
342342
if (!cmd_packet) {
343343
SET_OOM_ERROR(*conn->error_info);
344344
DBG_RETURN(FAIL);
@@ -473,7 +473,7 @@ mysqlnd_switch_to_ssl_if_needed(
473473
DBG_INF_FMT("CLIENT_SSL_VERIFY_SERVER_CERT= %d", mysql_flags & CLIENT_SSL_VERIFY_SERVER_CERT? 1:0);
474474
DBG_INF_FMT("CLIENT_REMEMBER_OPTIONS= %d", mysql_flags & CLIENT_REMEMBER_OPTIONS? 1:0);
475475

476-
auth_packet = conn->protocol->m.get_auth_packet(conn->protocol, FALSE);
476+
auth_packet = conn->payload_decoder_factory->m.get_auth_packet(conn->payload_decoder_factory, FALSE);
477477
if (!auth_packet) {
478478
SET_OOM_ERROR(*conn->error_info);
479479
goto end;
@@ -800,7 +800,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn,
800800

801801
DBG_ENTER("mysqlnd_conn_data::connect_handshake");
802802

803-
greet_packet = conn->protocol->m.get_greet_packet(conn->protocol, FALSE);
803+
greet_packet = conn->payload_decoder_factory->m.get_greet_packet(conn->payload_decoder_factory, FALSE);
804804
if (!greet_packet) {
805805
SET_OOM_ERROR(*conn->error_info);
806806
DBG_RETURN(FAIL); /* OOM */
@@ -1761,7 +1761,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, zend_stri
17611761
if (FAIL == ret) {
17621762
break;
17631763
}
1764-
stats_header = conn->protocol->m.get_stats_packet(conn->protocol, FALSE);
1764+
stats_header = conn->payload_decoder_factory->m.get_stats_packet(conn->payload_decoder_factory, FALSE);
17651765
if (!stats_header) {
17661766
SET_OOM_ERROR(*conn->error_info);
17671767
break;
@@ -2983,9 +2983,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, init)(MYSQLND_CONN_DATA * conn)
29832983
SET_ERROR_AFF_ROWS(conn);
29842984

29852985
conn->net = mysqlnd_net_init(conn->persistent, conn->stats, conn->error_info);
2986-
conn->protocol = mysqlnd_protocol_init(conn->persistent);
2986+
conn->payload_decoder_factory = mysqlnd_protocol_payload_decoder_factory_init(conn->persistent);
29872987

2988-
DBG_RETURN(conn->stats && conn->net && conn->protocol? PASS:FAIL);
2988+
DBG_RETURN(conn->stats && conn->net && conn->payload_decoder_factory? PASS:FAIL);
29892989
}
29902990
/* }}} */
29912991

‎ext/mysqlnd/mysqlnd_auth.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn,
5757

5858
DBG_ENTER("mysqlnd_auth_handshake");
5959

60-
auth_resp_packet = conn->protocol->m.get_auth_response_packet(conn->protocol, FALSE);
60+
auth_resp_packet = conn->payload_decoder_factory->m.get_auth_response_packet(conn->payload_decoder_factory, FALSE);
6161

6262
if (!auth_resp_packet) {
6363
SET_OOM_ERROR(*conn->error_info);
6464
goto end;
6565
}
6666

6767
if (use_full_blown_auth_packet != TRUE) {
68-
change_auth_resp_packet = conn->protocol->m.get_change_auth_response_packet(conn->protocol, FALSE);
68+
change_auth_resp_packet = conn->payload_decoder_factory->m.get_change_auth_response_packet(conn->payload_decoder_factory, FALSE);
6969
if (!change_auth_resp_packet) {
7070
SET_OOM_ERROR(*conn->error_info);
7171
goto end;
@@ -80,7 +80,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn,
8080
goto end;
8181
}
8282
} else {
83-
auth_packet = conn->protocol->m.get_auth_packet(conn->protocol, FALSE);
83+
auth_packet = conn->payload_decoder_factory->m.get_auth_packet(conn->payload_decoder_factory, FALSE);
8484

8585
auth_packet->client_flags = mysql_flags;
8686
auth_packet->max_packet_size = session_options->max_allowed_packet;
@@ -178,15 +178,15 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn,
178178

179179
DBG_ENTER("mysqlnd_auth_change_user");
180180

181-
chg_user_resp = conn->protocol->m.get_change_user_response_packet(conn->protocol, FALSE);
181+
chg_user_resp = conn->payload_decoder_factory->m.get_change_user_response_packet(conn->payload_decoder_factory, FALSE);
182182

183183
if (!chg_user_resp) {
184184
SET_OOM_ERROR(*conn->error_info);
185185
goto end;
186186
}
187187

188188
if (use_full_blown_auth_packet != TRUE) {
189-
change_auth_resp_packet = conn->protocol->m.get_change_auth_response_packet(conn->protocol, FALSE);
189+
change_auth_resp_packet = conn->payload_decoder_factory->m.get_change_auth_response_packet(conn->payload_decoder_factory, FALSE);
190190
if (!change_auth_resp_packet) {
191191
SET_OOM_ERROR(*conn->error_info);
192192
goto end;
@@ -201,7 +201,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn,
201201
goto end;
202202
}
203203
} else {
204-
auth_packet = conn->protocol->m.get_auth_packet(conn->protocol, FALSE);
204+
auth_packet = conn->payload_decoder_factory->m.get_auth_packet(conn->payload_decoder_factory, FALSE);
205205

206206
if (!auth_packet) {
207207
SET_OOM_ERROR(*conn->error_info);
@@ -260,7 +260,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn,
260260
When it gets fixed, there should be one more check here
261261
*/
262262
if (conn->m->get_server_version(conn) > 50113L &&conn->m->get_server_version(conn) < 50118L) {
263-
MYSQLND_PACKET_OK * redundant_error_packet = conn->protocol->m.get_ok_packet(conn->protocol, FALSE);
263+
MYSQLND_PACKET_OK * redundant_error_packet = conn->payload_decoder_factory->m.get_ok_packet(conn->payload_decoder_factory, FALSE);
264264
if (redundant_error_packet) {
265265
PACKET_READ(redundant_error_packet, conn);
266266
PACKET_FREE(redundant_error_packet);
@@ -499,12 +499,12 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn,
499499

500500
do {
501501
DBG_INF("requesting the public key from the server");
502-
pk_req_packet = conn->protocol->m.get_sha256_pk_request_packet(conn->protocol, FALSE);
502+
pk_req_packet = conn->payload_decoder_factory->m.get_sha256_pk_request_packet(conn->payload_decoder_factory, FALSE);
503503
if (!pk_req_packet) {
504504
SET_OOM_ERROR(*conn->error_info);
505505
break;
506506
}
507-
pk_resp_packet = conn->protocol->m.get_sha256_pk_request_response_packet(conn->protocol, FALSE);
507+
pk_resp_packet = conn->payload_decoder_factory->m.get_sha256_pk_request_response_packet(conn->payload_decoder_factory, FALSE);
508508
if (!pk_resp_packet) {
509509
SET_OOM_ERROR(*conn->error_info);
510510
PACKET_FREE(pk_req_packet);

‎ext/mysqlnd/mysqlnd_driver.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -282,18 +282,18 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_io_channel)(zend_bool persistent, MYS
282282
/* }}} */
283283

284284

285-
/* {{{ mysqlnd_object_factory::get_protocol_decoder */
286-
static MYSQLND_PROTOCOL *
287-
MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_decoder)(zend_bool persistent)
285+
/* {{{ mysqlnd_object_factory::get_protocol_payload_decoder_factory */
286+
static MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY *
287+
MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory)(zend_bool persistent)
288288
{
289-
size_t alloc_size = sizeof(MYSQLND_PROTOCOL) + mysqlnd_plugin_count() * sizeof(void *);
290-
MYSQLND_PROTOCOL *ret = mnd_pecalloc(1, alloc_size, persistent);
289+
size_t alloc_size = sizeof(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY) + mysqlnd_plugin_count() * sizeof(void *);
290+
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY *ret = mnd_pecalloc(1, alloc_size, persistent);
291291

292-
DBG_ENTER("mysqlnd_object_factory::get_protocol_decoder");
292+
DBG_ENTER("mysqlnd_object_factory::get_protocol_payload_decoder_factory");
293293
DBG_INF_FMT("persistent=%u", persistent);
294294
if (ret) {
295295
ret->persistent = persistent;
296-
ret->m = mysqlnd_mysqlnd_protocol_methods;
296+
ret->m = MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_payload_decoder_factory);
297297
}
298298

299299
DBG_RETURN(ret);
@@ -306,7 +306,7 @@ PHPAPI MYSQLND_CLASS_METHODS_START(mysqlnd_object_factory)
306306
MYSQLND_METHOD(mysqlnd_object_factory, clone_connection_object),
307307
MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement),
308308
MYSQLND_METHOD(mysqlnd_object_factory, get_io_channel),
309-
MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_decoder)
309+
MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory)
310310
MYSQLND_CLASS_METHODS_END;
311311

312312
/*

‎ext/mysqlnd/mysqlnd_ext_plugin.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ PHPAPI void ** _mysqlnd_plugin_get_plugin_result_buffered_data_c(const MYSQLND_R
110110

111111
/* {{{ _mysqlnd_plugin_get_plugin_protocol_data */
112112
PHPAPI void **
113-
_mysqlnd_plugin_get_plugin_protocol_data(const MYSQLND_PROTOCOL * protocol, unsigned int plugin_id)
113+
_mysqlnd_plugin_get_plugin_protocol_data(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, unsigned int plugin_id)
114114
{
115115
DBG_ENTER("_mysqlnd_plugin_get_plugin_protocol_data");
116116
DBG_INF_FMT("plugin_id=%u", plugin_id);
117-
if (!protocol || plugin_id >= mysqlnd_plugin_count()) {
117+
if (!factory || plugin_id >= mysqlnd_plugin_count()) {
118118
return NULL;
119119
}
120-
DBG_RETURN((void *)((char *)protocol + sizeof(MYSQLND_PROTOCOL) + plugin_id * sizeof(void *)));
120+
DBG_RETURN((void *)((char *)factory + sizeof(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY) + plugin_id * sizeof(void *)));
121121
}
122122
/* }}} */
123123

@@ -253,20 +253,20 @@ mysqlnd_stmt_set_methods(struct st_mysqlnd_stmt_methods *methods)
253253
/* }}} */
254254

255255

256-
/* {{{ mysqlnd_protocol_get_methods */
257-
PHPAPI struct st_mysqlnd_protocol_methods *
258-
mysqlnd_protocol_get_methods()
256+
/* {{{ mysqlnd_protocol_payload_decoder_factory_get_methods */
257+
PHPAPI struct st_mysqlnd_protocol_payload_decoder_factory_methods *
258+
mysqlnd_protocol_payload_decoder_factory_get_methods()
259259
{
260-
return &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol);
260+
return &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_payload_decoder_factory);
261261
}
262262
/* }}} */
263263

264264

265-
/* {{{ mysqlnd_protocol_set_methods */
265+
/* {{{ mysqlnd_protocol_payload_decoder_factory_set_methods */
266266
PHPAPI void
267-
mysqlnd_protocol_set_methods(struct st_mysqlnd_protocol_methods * methods)
267+
mysqlnd_protocol_payload_decoder_factory_set_methods(struct st_mysqlnd_protocol_payload_decoder_factory_methods * methods)
268268
{
269-
MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol) = *methods;
269+
MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_payload_decoder_factory) = *methods;
270270
}
271271
/* }}} */
272272

‎ext/mysqlnd/mysqlnd_ext_plugin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ PHPAPI void ** _mysqlnd_plugin_get_plugin_result_buffered_data_c(const MYSQLND_R
4343
PHPAPI void ** _mysqlnd_plugin_get_plugin_stmt_data(const MYSQLND_STMT * stmt, unsigned int plugin_id);
4444
#define mysqlnd_plugin_get_plugin_stmt_data(s, p_id) _mysqlnd_plugin_get_plugin_stmt_data((s), (p_id))
4545

46-
PHPAPI void ** _mysqlnd_plugin_get_plugin_protocol_data(const MYSQLND_PROTOCOL * protocol, unsigned int plugin_id);
46+
PHPAPI void ** _mysqlnd_plugin_get_plugin_protocol_data(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, unsigned int plugin_id);
4747
#define mysqlnd_plugin_get_plugin_protocol_data(p, p_id) _mysqlnd_plugin_get_plugin_protocol_data((p), (p_id))
4848

4949
PHPAPI void ** _mysqlnd_plugin_get_plugin_net_data(const MYSQLND_NET * net, unsigned int plugin_id);

‎ext/mysqlnd/mysqlnd_priv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_conn_data);
179179
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_res);
180180
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_result_unbuffered);
181181
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_result_buffered);
182-
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_protocol);
182+
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_protocol_payload_decoder_factory);
183183
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_net);
184184

185185
enum_func_status mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zend_bool * is_warning);

‎ext/mysqlnd/mysqlnd_ps.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,12 @@ mysqlnd_stmt_skip_metadata(MYSQLND_STMT * s)
265265
MYSQLND_PACKET_RES_FIELD * field_packet;
266266

267267
DBG_ENTER("mysqlnd_stmt_skip_metadata");
268-
if (!stmt || !stmt->conn || !stmt->conn->protocol) {
268+
if (!stmt || !stmt->conn || !stmt->conn->payload_decoder_factory) {
269269
DBG_RETURN(FAIL);
270270
}
271271
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
272272

273-
field_packet = stmt->conn->protocol->m.get_result_field_packet(stmt->conn->protocol, FALSE);
273+
field_packet = stmt->conn->payload_decoder_factory->m.get_result_field_packet(stmt->conn->payload_decoder_factory, FALSE);
274274
if (!field_packet) {
275275
SET_OOM_ERROR(*stmt->error_info);
276276
SET_OOM_ERROR(*stmt->conn->error_info);
@@ -300,12 +300,12 @@ mysqlnd_stmt_read_prepare_response(MYSQLND_STMT * s)
300300
enum_func_status ret = FAIL;
301301

302302
DBG_ENTER("mysqlnd_stmt_read_prepare_response");
303-
if (!stmt || !stmt->conn || !stmt->conn->protocol) {
303+
if (!stmt || !stmt->conn || !stmt->conn->payload_decoder_factory) {
304304
DBG_RETURN(FAIL);
305305
}
306306
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
307307

308-
prepare_resp = stmt->conn->protocol->m.get_prepare_response_packet(stmt->conn->protocol, FALSE);
308+
prepare_resp = stmt->conn->payload_decoder_factory->m.get_prepare_response_packet(stmt->conn->payload_decoder_factory, FALSE);
309309
if (!prepare_resp) {
310310
SET_OOM_ERROR(*stmt->error_info);
311311
SET_OOM_ERROR(*stmt->conn->error_info);
@@ -344,12 +344,12 @@ mysqlnd_stmt_prepare_read_eof(MYSQLND_STMT * s)
344344
enum_func_status ret = FAIL;
345345

346346
DBG_ENTER("mysqlnd_stmt_prepare_read_eof");
347-
if (!stmt || !stmt->conn || !stmt->conn->protocol) {
347+
if (!stmt || !stmt->conn || !stmt->conn->payload_decoder_factory) {
348348
DBG_RETURN(FAIL);
349349
}
350350
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
351351

352-
fields_eof = stmt->conn->protocol->m.get_eof_packet(stmt->conn->protocol, FALSE);
352+
fields_eof = stmt->conn->payload_decoder_factory->m.get_eof_packet(stmt->conn->payload_decoder_factory, FALSE);
353353
if (!fields_eof) {
354354
SET_OOM_ERROR(*stmt->error_info);
355355
SET_OOM_ERROR(*stmt->conn->error_info);

‎ext/mysqlnd/mysqlnd_result.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
411411

412412
ret = FAIL;
413413
do {
414-
rset_header = conn->protocol->m.get_rset_header_packet(conn->protocol, FALSE);
414+
rset_header = conn->payload_decoder_factory->m.get_rset_header_packet(conn->payload_decoder_factory, FALSE);
415415
if (!rset_header) {
416416
SET_OOM_ERROR(*conn->error_info);
417417
ret = FAIL;
@@ -542,7 +542,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
542542
}
543543

544544
/* Check for SERVER_STATUS_MORE_RESULTS if needed */
545-
fields_eof = conn->protocol->m.get_eof_packet(conn->protocol, FALSE);
545+
fields_eof = conn->payload_decoder_factory->m.get_eof_packet(conn->payload_decoder_factory, FALSE);
546546
if (!fields_eof) {
547547
SET_OOM_ERROR(*conn->error_info);
548548
ret = FAIL;
@@ -944,7 +944,7 @@ MYSQLND_METHOD(mysqlnd_res, use_result)(MYSQLND_RES * const result, zend_bool ps
944944
this to be not NULL.
945945
*/
946946
/* FALSE = non-persistent */
947-
result->unbuf->row_packet = result->conn->protocol->m.get_row_packet(result->conn->protocol, FALSE);
947+
result->unbuf->row_packet = result->conn->payload_decoder_factory->m.get_row_packet(result->conn->payload_decoder_factory, FALSE);
948948
if (!result->unbuf->row_packet) {
949949
goto oom;
950950
}
@@ -1295,7 +1295,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
12951295
set->references = 1;
12961296

12971297
/* non-persistent */
1298-
row_packet = conn->protocol->m.get_row_packet(conn->protocol, FALSE);
1298+
row_packet = conn->payload_decoder_factory->m.get_row_packet(conn->payload_decoder_factory, FALSE);
12991299
if (!row_packet) {
13001300
SET_OOM_ERROR(*conn->error_info);
13011301
ret = FAIL;

‎ext/mysqlnd/mysqlnd_result_meta.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
5757

5858
DBG_ENTER("mysqlnd_res_meta::read_metadata");
5959

60-
field_packet = conn->protocol->m.get_result_field_packet(conn->protocol, FALSE);
60+
field_packet = conn->payload_decoder_factory->m.get_result_field_packet(conn->payload_decoder_factory, FALSE);
6161
if (!field_packet) {
6262
SET_OOM_ERROR(*conn->error_info);
6363
DBG_RETURN(FAIL);

0 commit comments

Comments
 (0)